白马相关

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/Task.java

@@ -129,4 +129,10 @@ public class Task extends BaseEntity {
     @ApiModelProperty("合同段ID")
     private String contractId;
 
+    /**
+     * 试验自检记录id
+     */
+    @ApiModelProperty("试验自检记录id")
+    private Long trialSelfInspectionRecordId;
+
 }

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/TrialSelfInspectionRecord.java

@@ -55,7 +55,7 @@ public class TrialSelfInspectionRecord extends BaseEntity {
     @ApiModelProperty(value = "检测结果 '0'=不合格 '1'=合格")
     private Integer detectionResult;
 
-    @ApiModelProperty(value = "工程部位及用途")
+    @ApiModelProperty(value = "工程部位及用途，当前合同段质检树节点ids")
     private String projectPosition;
 
     @ApiModelProperty(value = "报告日期")

blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/StartTaskVO.java

@@ -54,6 +54,12 @@ public class StartTaskVO {
     @ApiModelProperty("自定义流程,所选的审批人ID和姓名集合")
     private List<CustomUserTask> userTasks;
 
+    /**
+     * 试验自检记录id
+     */
+    @ApiModelProperty("试验自检记录id")
+    private Long trialSelfInspectionRecordId;
+
     public void setUserTasks(String userId, String userName){
         if(this.userTasks == null){
             this.userTasks = new ArrayList<>();

blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/TaskVO.java

@@ -56,6 +56,12 @@ public class TaskVO extends Task {
 	@ApiModelProperty("电签状态")
 	private String eVisaContent;
 
+	/**
+	 * 试验自检记录id
+	 */
+	@ApiModelProperty("试验自检记录id")
+	private Long trialSelfInspectionRecordId;
+
 	public void setUserTasks(String userId, String userName){
 		if(this.userTasks == null){
 			this.userTasks = new ArrayList<>();

blade-service/blade-business/pom.xml

@@ -122,4 +122,22 @@
 
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                    <compilerArguments>
+                        <bootclasspath>${java.home}/lib/rt.jar;${java.home}/lib/jce.jar;${java.home}/lib/jsse.jar
+                        </bootclasspath>
+                    </compilerArguments>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

blade-service/blade-business/src/main/java/org/springblade/business/controller/TaskController.java

@@ -44,6 +44,7 @@ import org.springblade.business.vo.TaskVO;
 import org.springblade.business.service.ITaskService;
 import org.springblade.core.boot.ctrl.BladeController;
 
+import java.io.FileNotFoundException;
 import java.time.Duration;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -256,7 +257,7 @@ public class TaskController extends BladeController {
 	@PostMapping("/batch-complete-approval-task")
 	@ApiOperationSupport(order = 8)
 	@ApiOperation(value = "批量审批")
-	public R<Boolean> batchCompleteApprovalTask(@RequestBody BatchTaskVO batchTaskVO){
+	public R<Boolean> batchCompleteApprovalTask(@RequestBody BatchTaskVO batchTaskVO) throws FileNotFoundException {
 		String taskIds = batchTaskVO.getTaskIds();
 		String parallelProcessInstanceIds = batchTaskVO.getParallelProcessInstanceIds();
 		if(StringUtils.isNotEmpty(taskIds)){
@@ -499,7 +500,7 @@ public class TaskController extends BladeController {
 	@PostMapping("/complete-approval-task")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "完成/审批任务")
-	public R<Boolean> completeApprovalTask(@RequestBody TaskApprovalVO taskApprovalVO){
+	public R<Boolean> completeApprovalTask(@RequestBody TaskApprovalVO taskApprovalVO) throws FileNotFoundException {
 
 		//检查当前用户是否存在等待批次
 		long batchCount = this.taskBatchService.count(Wrappers.<TaskBatch>lambdaQuery().eq(TaskBatch::getCreateUser, AuthUtil.getUserId()));

blade-service/blade-business/src/main/java/org/springblade/business/mapper/TrialSelfInspectionRecordMapper.java

@@ -1,6 +1,7 @@
 package org.springblade.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.business.entity.TrialSelfInspectionRecord;
 
 import java.util.List;
@@ -17,4 +18,16 @@ public interface TrialSelfInspectionRecordMapper extends BaseMapper<TrialSelfIns
 
     String selectMobilizationRecord(String sampleId);
 
+    String selectTaskByTaskId(@Param("id") String id);
+
+    void delSelfQuality(Long id);
+
+    void saveSelfQuality(Long id, Long selfId, String qualityNodeId);
+
+    List<String> selectQualityNodeId(String id);
+
+    String selectInformationQuery(String id, String contractId, String classify);
+
+    void updateInformationQuery(String id, String contractId, String classify, String link);
+
 }

blade-service/blade-business/src/main/java/org/springblade/business/mapper/TrialSelfInspectionRecordMapper.xml

@@ -36,10 +36,22 @@
         insert into u_trial_self_sample(id,self_id,sampling_id) values(#{id},#{selfId},#{samplingId})
     </insert>
 
+    <insert id="saveSelfQuality">
+        insert into u_trial_self_quality_project(id,self_id,quality_node_id) values(#{id},#{selfId},#{qualityNodeId})
+    </insert>
+
+    <update id="updateInformationQuery">
+        update u_information_query set pdf_url = #{link} where wbs_id = #{id} and classify = #{classify} and contract_id = #{contractId} and is_deleted = 0
+    </update>
+
     <delete id="delSelfSample">
         delete from u_trial_self_sample where self_id = #{id}
     </delete>
 
+    <delete id="delSelfQuality">
+        delete from u_trial_self_quality_project where self_id = #{id}
+    </delete>
+
     <select id="selectAll" resultType="org.springblade.business.entity.TrialSelfInspectionRecord">
         select * from u_trial_self_inspection_record where node_id = #{nodeId}
     </select>
@@ -52,4 +64,16 @@
         select mobilization_id from u_trial_sampling_record where sample_info_id = #{sampleId}
     </select>
 
+    <select id="selectTaskByTaskId" resultType="java.lang.String">
+        select trial_self_inspection_record_id from u_task where process_instance_id = #{id}
+    </select>
+
+    <select id="selectQualityNodeId" resultType="java.lang.String">
+        select quality_node_id from u_trial_self_quality_project where self_id = #{id}
+    </select>
+
+    <select id="selectInformationQuery" resultType="java.lang.String">
+        select pdf_url from u_information_query where wbs_id = #{id} and classify = #{classify} and contract_id = #{contractId} and is_deleted = 0
+    </select>
+
 </mapper>

blade-service/blade-business/src/main/java/org/springblade/business/service/ITaskService.java

@@ -22,6 +22,7 @@ import org.springblade.business.vo.TaskApprovalVO;
 import org.springblade.business.vo.TaskVO;
 import org.springblade.core.mp.base.BaseService;
 
+import java.io.FileNotFoundException;
 import java.util.List;
 
 /**
@@ -48,7 +49,7 @@ public interface ITaskService extends BaseService<Task> {
     /**
      * 批量审批
      */
-    void batchCompleteApprovalTask(List<TaskApprovalVO> taskApprovalVOS);
+    void batchCompleteApprovalTask(List<TaskApprovalVO> taskApprovalVOS) throws FileNotFoundException;
 
     /**
      * 启动流程

blade-service/blade-business/src/main/java/org/springblade/business/service/ITrialSelfInspectionRecordService.java

@@ -5,10 +5,7 @@ import org.springblade.business.dto.RawMaterialSubmitRelationDTO;
 import org.springblade.business.dto.TrialSelfInspectionRecordDTO;
 import org.springblade.business.dto.TrialSelfInspectionRecordPageDTO;
 import org.springblade.business.entity.TrialSelfInspectionRecord;
-import org.springblade.business.vo.SampleAncillaryDocumentsVO;
-import org.springblade.business.vo.TrialSampleInfoVO;
-import org.springblade.business.vo.TrialSelfInspectionRecordVO;
-import org.springblade.business.vo.TrialSelfInspectionRecordVO2;
+import org.springblade.business.vo.*;
 import org.springblade.core.mp.base.BaseService;
 
 import java.io.FileNotFoundException;
@@ -36,4 +33,6 @@ public interface ITrialSelfInspectionRecordService extends BaseService<TrialSelf
 
     String selfPrintNullPdf(String ids) throws Exception;
 
+    void updateTrialSelfInspectionRecordStatus(List<TaskApprovalVO> obj) throws FileNotFoundException;
+
 }

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TaskServiceImpl.java

@@ -44,6 +44,7 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.io.FileNotFoundException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -90,6 +91,8 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
 
     private final ITaskBatchService taskBatchService;
 
+    private final ITrialSelfInspectionRecordService iTrialSelfInspectionRecordService;
+
     @Override
     public List<TaskParallel> queryApprovalUser(String formDataIds) {
         //返回结果
@@ -291,7 +294,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
 
     @Async
     @Override
-    public void batchCompleteApprovalTask(List<TaskApprovalVO> taskApprovalVOS) {
+    public void batchCompleteApprovalTask(List<TaskApprovalVO> taskApprovalVOS) throws FileNotFoundException {
         List<String> taskIds = taskApprovalVOS.stream().map(TaskApprovalVO::getParallelProcessInstanceId).distinct().collect(Collectors.toList());
 
         long batch = this.taskBatchService.count(Wrappers.<TaskBatch>lambdaQuery().eq(TaskBatch::getCreateUser, AuthUtil.getUserId()));
@@ -320,6 +323,10 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
             //执行电签，结束后检查在执行是否有新的等待批次
             this.checkIsExsitTaskBatch(taskApprovalVOS, taskBatch.getId().toString());
         }
+
+        //修改试验填报状态
+        this.iTrialSelfInspectionRecordService.updateTrialSelfInspectionRecordStatus(taskApprovalVOS);
+
     }
 
     private void checkIsExsitTaskBatch(List<TaskApprovalVO> taskApprovalVOS, String batchId){

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TrialDeviceInfoServiceImpl.java

@@ -68,7 +68,7 @@ public class TrialDeviceInfoServiceImpl extends BaseServiceImpl<TrialDeviceInfoM
     }
 
     /**
-     * 修改校验状态定时任务
+     * 修改校验状态
      * cron = "0 0 1 * * ?" 每天1点执行
      */
     @Scheduled(cron = "0 0 1 * * ?")

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TrialSelfInspectionRecordServiceImpl.java

@@ -24,10 +24,7 @@ import org.springblade.business.service.ITrialSelfInspectionRecordService;
 import org.springblade.business.utils.FileUtils;
 import org.springblade.business.utils.FileUtils2;
 import org.springblade.business.utils.StringSPUtils;
-import org.springblade.business.vo.SampleAncillaryDocumentsVO;
-import org.springblade.business.vo.TrialSampleInfoVO;
-import org.springblade.business.vo.TrialSelfInspectionRecordVO;
-import org.springblade.business.vo.TrialSelfInspectionRecordVO2;
+import org.springblade.business.vo.*;
 import org.springblade.business.wrapper.TrialSelfInspectionRecordWarpper;
 import org.springblade.common.constant.CommonConstant;
 import org.springblade.common.utils.CommonUtil;
@@ -40,6 +37,7 @@ import org.springblade.core.tool.utils.*;
 import org.springblade.manager.entity.*;
 import org.springblade.manager.feign.ContractClient;
 import org.springblade.manager.feign.ExcelTabClient;
+import org.springblade.manager.feign.WbsTreeContractClient;
 import org.springblade.manager.feign.WbsTreePrivateClient;
 import org.springblade.resource.feign.NewIOSSClient;
 import org.springblade.system.cache.ParamCache;
@@ -68,6 +66,7 @@ public class TrialSelfInspectionRecordServiceImpl
     private IUserClient iUserClient;
     private ContractClient contractClient;
     private WbsTreePrivateClient wbsTreePrivateClient;
+    private WbsTreeContractClient wbsTreeContractClient;
     private ExcelTabClient excelTabClient;
     private IDictClient iDictClient;
     private JdbcTemplate jdbcTemplate;
@@ -95,6 +94,9 @@ public class TrialSelfInspectionRecordServiceImpl
         IPage<TrialSelfInspectionRecordVO> trialSelfInspectionRecordVOIPage = TrialSelfInspectionRecordWarpper.build().pageVO(pages);
         List<TrialSelfInspectionRecordVO> records = trialSelfInspectionRecordVOIPage.getRecords();
         List<Dict> trialDetectionCategory = iDictClient.getList("trial_detection_category").getData();
+
+        List<WbsTreeContract> contractTreeList = wbsTreeContractClient.getContractWbsTreeByContractId(dto.getContractId());
+
         for (TrialSelfInspectionRecordVO record : records) {
             for (Dict dict : trialDetectionCategory) {
                 if (dict.getDictKey().equals(String.valueOf(record.getDetectionCategory()))) {
@@ -103,7 +105,18 @@ public class TrialSelfInspectionRecordServiceImpl
             }
             record.setIsUploadCertificateName(record.getIsUploadCertificate().equals(1) ? "是" : "否");
             record.setDetectionResultName(record.getDetectionResult().equals(1) ? "合格" : "不合格");
-            //record.setProjectPositionName(); TODO 工程部位及用途名称
+
+            //工程部位及用途名称
+            if (contractTreeList.size() > 0) {
+                List<String> projectPositionNames = new ArrayList<>();
+                for (WbsTreeContract wbsTreeContract : contractTreeList) {
+                    if (String.valueOf(wbsTreeContract.getPKeyId()).contains(record.getProjectPosition())) {
+                        projectPositionNames.add(wbsTreeContract.getNodeName());
+                    }
+                }
+                String name = projectPositionNames.stream().findAny().orElse(null);
+                record.setProjectPositionName(name + "等" + projectPositionNames.size() + "个工程部位信息");
+            }
         }
         return trialSelfInspectionRecordVOIPage.setRecords(records);
     }
@@ -293,6 +306,60 @@ public class TrialSelfInspectionRecordServiceImpl
         return null;
     }
 
+    @Override
+    public void updateTrialSelfInspectionRecordStatus(List<TaskApprovalVO> obj) throws FileNotFoundException {
+        for (TaskApprovalVO taskApprovalVO : obj) {
+            if (ObjectUtil.isNotEmpty(taskApprovalVO.getParallelProcessInstanceId())) {
+                String trialSelfInspectionRecordId = baseMapper.selectTaskByTaskId(taskApprovalVO.getParallelProcessInstanceId());
+                if (StringUtils.isNotEmpty(trialSelfInspectionRecordId)) {
+                    LambdaUpdateWrapper<TrialSelfInspectionRecord> updateWrapper = new LambdaUpdateWrapper<>();
+                    updateWrapper.set(TrialSelfInspectionRecord::getTaskStatus, "OK".equals(taskApprovalVO.getFlag()) ? "已审批" : "已废除");
+                    updateWrapper.eq(TrialSelfInspectionRecord::getId, trialSelfInspectionRecordId);
+                    baseMapper.update(null, updateWrapper);
+
+                    TrialSelfInspectionRecord entity = updateWrapper.getEntity();
+
+                    //把当前试验的PDF合并关联到质检树节点下
+                    if (ObjectUtil.isNotEmpty(entity) && ("已审批").equals(entity.getTaskStatus())) {
+                        List<String> contractNodePKeyIds = baseMapper.selectQualityNodeId(trialSelfInspectionRecordId);
+
+                        for (String id : contractNodePKeyIds) {
+                            WbsTreeContract wbsTreeContract = wbsTreeContractClient.getContractNodeByPrimaryKeyId(id);
+                            if (wbsTreeContract != null) {
+                                List<String> pdfUrlList = new ArrayList<>();
+                                String classify;
+                                if (wbsTreeContract.getTableOwner().contains("1") || wbsTreeContract.getTableOwner().contains("2") || wbsTreeContract.getTableOwner().contains("3")) {
+                                    classify = "1";
+                                } else {
+                                    classify = "2";
+                                }
+                                String pdfUrlAll = baseMapper.selectInformationQuery(id, wbsTreeContract.getContractId(), classify);
+                                //质检节点合并pdfUrl
+                                pdfUrlList.add(pdfUrlAll);
+                                //试验pdfUrl
+                                pdfUrlList.add(ObjectUtil.isNotEmpty(entity.getPdfUrl()) ? entity.getPdfUrl() : "");
+
+                                //合并PDF
+                                String filePath = ParamCache.getValue(CommonConstant.SYS_LOCAL_URL);
+                                String listPdf = filePath + "/pdf/" + id + ".pdf";
+                                File tabPDF = ResourceUtil.getFile(listPdf);
+                                if (tabPDF.exists()) {
+                                    tabPDF.delete();
+                                }
+                                FileUtils.mergePdfPublicMethods(pdfUrlList, listPdf);
+                                BladeFile bladeFile = this.newIOSSClient.uploadFile(id + ".pdf", listPdf);
+                                if (bladeFile != null) {
+                                    //修改质检合并pdfURL
+                                    baseMapper.updateInformationQuery(id, wbsTreeContract.getContractId(), classify, bladeFile.getLink());
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     private String getTrialPdfUrl(WbsTreePrivate wbsTreePrivate) throws Exception {
         String file_path = ParamCache.getValue(CommonConstant.SYS_LOCAL_URL);
         if (wbsTreePrivate == null) {
@@ -361,9 +428,14 @@ public class TrialSelfInspectionRecordServiceImpl
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean selfSubmit(TrialSelfInspectionRecordDTO dto) throws Exception {
-        if (ObjectUtil.isEmpty(dto.getId())) { //构建记录表编号、报告单编号
+        if (ObjectUtil.isEmpty(dto.getId())) {
+            //构建记录表编号、报告单编号
             this.buildNumber(dto);
+
+            //任务流程状态初始化
+            dto.setTaskStatus("待审批");
         }
+
         JSONArray dataArray = dto.getDataInfo().getJSONArray("orderList");
         List<String> tableIds = new ArrayList<>();
         for (int i = 0; i < dataArray.size(); i++) {
@@ -373,18 +445,70 @@ public class TrialSelfInspectionRecordServiceImpl
         String tableIdsAll = Func.toStr(tableIds).replaceAll("\\[", "").replaceAll("]", "");
         dto.setTableIds(tableIdsAll);
 
-        this.saveOrUpdate(dto); //新增或修改
+        //新增或修改
+        this.saveOrUpdate(dto);
 
-        if (ObjectUtil.isNotEmpty(dto.getId())) { //关联样品
-            List<String> ids = Func.toStrList(dto.getSampleIds());
-            baseMapper.delSelfSample(dto.getId()); //删除关联信息
-            for (String id : ids) {  //新增关联信息
-                baseMapper.saveSelfSample(SnowFlakeUtil.getId(), dto.getId(), id);
+        if (ObjectUtil.isNotEmpty(dto.getId())) {
+            //关联样品信息
+            if (StringUtils.isNotEmpty(dto.getSampleIds())) {
+                baseMapper.delSelfSample(dto.getId()); //删除关联信息
+                List<String> ids = Func.toStrList(dto.getSampleIds());
+                for (String id : ids) {  //新增关联信息
+                    baseMapper.saveSelfSample(SnowFlakeUtil.getId(), dto.getId(), id);
+                }
+            }
+
+            //关联工程部位及用途信息
+            if (StringUtils.isNotEmpty(dto.getProjectPosition())) {
+                baseMapper.delSelfQuality(dto.getId()); //删除关联信息
+                List<String> ids = Func.toStrList(dto.getProjectPosition());
+                for (String id : ids) { //新增关联信息
+                    baseMapper.saveSelfQuality(SnowFlakeUtil.getId(), dto.getId(), id);
+                }
+
+                //已审批填报记录
+                if (("已审批").equals(dto.getTaskStatus())) {
+                    //把当前试验的PDF合并关联到质检树节点下
+                    List<String> contractNodePKeyIds = baseMapper.selectQualityNodeId(String.valueOf(dto.getId()));
+
+                    for (String id : contractNodePKeyIds) {
+                        WbsTreeContract wbsTreeContract = wbsTreeContractClient.getContractNodeByPrimaryKeyId(id);
+                        if (wbsTreeContract != null) {
+                            List<String> pdfUrlList = new ArrayList<>();
+                            String classify;
+                            if (wbsTreeContract.getTableOwner().contains("1") || wbsTreeContract.getTableOwner().contains("2") || wbsTreeContract.getTableOwner().contains("3")) {
+                                classify = "1";
+                            } else {
+                                classify = "2";
+                            }
+                            String pdfUrlAll = baseMapper.selectInformationQuery(id, wbsTreeContract.getContractId(), classify);
+                            //质检节点合并pdfUrl
+                            pdfUrlList.add(pdfUrlAll);
+                            //试验pdfUrl
+                            pdfUrlList.add(ObjectUtil.isNotEmpty(dto.getPdfUrl()) ? dto.getPdfUrl() : "");
+
+                            //合并PDF
+                            String filePath = ParamCache.getValue(CommonConstant.SYS_LOCAL_URL);
+                            String listPdf = filePath + "/pdf/" + id + ".pdf";
+                            File tabPDF = ResourceUtil.getFile(listPdf);
+                            if (tabPDF.exists()) {
+                                tabPDF.delete();
+                            }
+                            FileUtils.mergePdfPublicMethods(pdfUrlList, listPdf);
+                            BladeFile bladeFile = this.newIOSSClient.uploadFile(id + ".pdf", listPdf);
+                            if (bladeFile != null) {
+                                //修改质检合并pdfURL
+                                baseMapper.updateInformationQuery(id, wbsTreeContract.getContractId(), classify, bladeFile.getLink());
+                            }
+                        }
+                    }
+                }
             }
         }
 
         //保存实体表数据、记录信息
         String pdfURL = excelTabClient.saveTabData(dto.getDataInfo(), dto.getType(), dto.getTableType(), dto.getId());
+        //返回合并pdfURL
         if (StringUtils.isNotEmpty(pdfURL)) {
             LambdaUpdateWrapper<TrialSelfInspectionRecord> updateWrapper = new LambdaUpdateWrapper<>();
             updateWrapper.set(TrialSelfInspectionRecord::getPdfUrl, pdfURL);

blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java

@@ -548,6 +548,7 @@ public class UserController {
                             newUser.setUpdateTime(new Date());
                             newUser.setCreateTime(new Date());
                             newUser.setCompanyName(companyName);
+                            newUser.setRoleId("1537249581371707394"); //角色施工-资料员id：1537249581371707394
                             userService.submit(newUser);
 
                             //绑定项目，设置默认角色信息 白马项目id：1578599210897772545；第二期合同段id：1579773037233184770；角色施工-资料员id：1537249581371707394

blade-service/blade-user/src/main/java/org/springblade/system/user/util/AesInfoUtil.java

@@ -120,9 +120,9 @@ public class AesInfoUtil {
     }
 
 
-    public static void main(String[] args) {
+    /*public static void main(String[] args) {
 
-        /*System.out.println(AesUtil.encrypt("{\"userName\":\"liuzq\",\"password\":\"111111\"}",null));
+        *//*System.out.println(AesUtil.encrypt("{\"userName\":\"liuzq\",\"password\":\"111111\"}",null));
         System.out.println(URLEncoder.encode(AesUtil.encrypt("{\"userName\":\"liuzq\",\"password\":\"111111\"}",null)));
 
         System.out.println("-------------------------------------------");
@@ -134,12 +134,12 @@ public class AesInfoUtil {
         System.out.println(URLEncoder.encode(AesUtil.encrypt("{\"appid\":\"1001\",\"token\":\"c5cce0daf47f4356b670376bb2997580\"}",null)));
 
 
-        System.out.println("-------------------------------------------");*/
+        System.out.println("-------------------------------------------");*//*
         String token ="Yu3ijG%2FNsi5oVeOiNolqYpXl0pMLujUyX0kKS34VntLGjsBFIGVFgrA1uUPzmeSMBytVhFdv6eusjDQVgVoVXj42TAg9k0%2FmUdbVyhmay4rPFv0cVas4OTtdfnHlRnO8";
         System.out.println(AesInfoUtil.decrypt(URLDecoder.decode(token),null));
 //        System.out.println(AesUtil.decrypt("bRguv2/vDd8CM7Zl628dO3o/x75KeesR6BGsEyQsmq7o1BV+9Dk41PceRBg7r9n7q+3vb+dIWjYieKU4cXgTsQ==",null));
 
-    }
+    }*/
 
 
     public static String sendPost(String url, JSONObject json, String encoding) throws ParseException, IOException {