diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index ca2d6fdd..ccd200f7 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -14,7 +14,7 @@ import java.util.Map; import java.util.Set; @FeignClient(value = "bat-wkflow") -//@FeignClient(value = "shan") +//@FeignClient(value = "shan6") public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/activiti_define_start_user",method = RequestMethod.GET) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 1356e669..c9a24e7a 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -3,8 +3,8 @@ # 数据库配置 #============================================= spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver -spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test2?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false -#spring.datasource.url = jdbc:mysql://10.96.10.171/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false +#spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test2?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false +spring.datasource.url = jdbc:mysql://10.96.10.171/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false spring.datasource.username = root spring.datasource.password = root diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index d39b475a..50c4225d 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -40,6 +40,7 @@ eureka.client.fetch-registry=true #eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/ eureka.client.service-url.defaultZone=http://62.234.136.153:8761/eureka/ +#eureka.client.service-url.defaultZone=http://10.96.10.171:8761/eureka/ # 请求连接的超时时间 默认的时间为 1 秒 ribbon.ConnectTimeout=500000 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java index 4307db71..2ff5fc7c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java @@ -22,7 +22,7 @@ import java.util.List; public interface SarLawsAttrDetailedListDao extends BaseMapper { //根据清单id，查出标准的id并排序 - List selectLawsId(@Param("standId") String standId,@Param("param3") Integer page,@Param("param2") Integer size,@Param("sar") SarFindDto sarFindDto); + List selectLawsId(@Param("standId") String standId,@Param("param3") Integer page,@Param("param2") Integer size); //根据标准id查出数据 List selectLawsById(@Param("param1") List LawsIds, @Param("sarFindDto") SarFindDto sarFindDto); //根据标准id查出数据用于清单查询 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java index db12a5b6..06dc3d5d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java @@ -23,8 +23,5 @@ public class SarFindDto { // private String ZCCSSRQGJ; private String zrbm; private String sycpx; - private String standSort; - private String standType; - private String standNumber; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelDto.java index 5588e7e2..6805be5d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelDto.java @@ -29,7 +29,7 @@ public class StandExcelDto { @ApiModelProperty(value = "能源类型") private String NYLX; @ApiModelProperty(value = "标准实施日期") - private String SSRQ; + private String putTime; @ApiModelProperty(value = "新车型实施日期") private String newCarTime; @ApiModelProperty(value = "在产车实施日期") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java index 9028d493..a733b867 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java @@ -45,7 +45,7 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl selectPage = sarLawsAttrDetailedListDao.selectPage(pageRes,wrapper); //查询标准id - List lawsIds = sarLawsAttrDetailedListDao.selectLawsId(sarFindDto.getId(),(sarFindDto.getPage())-1,sarFindDto.getSize(),sarFindDto); + List lawsIds = sarLawsAttrDetailedListDao.selectLawsId(sarFindDto.getId(),(sarFindDto.getPage())-1,sarFindDto.getSize()); if (CollectionUtils.isEmpty(lawsIds)){ return null; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index 67bcf14b..4ab81ce3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java @@ -61,64 +61,64 @@ public class SarStandardComplianceAssessResultController { IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,type"); if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { - queryWrapper.like("STAND_NAME",eo.getStandName().trim()); + queryWrapper.like("STAND_NAME", eo.getStandName().trim()); } if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { - queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim()); + queryWrapper.like("STAND_NUMBER", eo.getStandNumber().trim()); } if (eo.getType() != null && !eo.getType().trim().equals("")) { - queryWrapper.like("type",eo.getType().trim()); + queryWrapper.like("type", eo.getType().trim()); } IPage page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper); - while(page.getRecords().remove(null)); + while (page.getRecords().remove(null)) ; return Result.success(page); - }else { - if(eo.getPosition()==1){ + } else { + if (eo.getPosition() == 1) { QueryWrapper queryWrapper = new QueryWrapper<>(); IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,type"); if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { - queryWrapper.like("STAND_NAME",eo.getStandName().trim()); + queryWrapper.like("STAND_NAME", eo.getStandName().trim()); } if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { - queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim()); + queryWrapper.like("STAND_NUMBER", eo.getStandNumber().trim()); } // if (eo.getType() != null && !eo.getType().trim().equals("")) { // queryWrapper.like("type",eo.getType().trim()); // } IPage page = iSarInterpretationNationalStandardService.page(iPage, queryWrapper); - while(page.getRecords().remove(null)); + while (page.getRecords().remove(null)) ; return Result.success(page); - }else{ + } else { QueryWrapper queryWrapper = new QueryWrapper<>(); IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,type"); if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { - queryWrapper.like("STAND_NAME",eo.getStandName().trim()); + queryWrapper.like("STAND_NAME", eo.getStandName().trim()); } if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { - queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim()); + queryWrapper.like("STAND_NUMBER", eo.getStandNumber().trim()); } // if (eo.getType() != null && !eo.getType().trim().equals("")) { // queryWrapper.like("type",eo.getType().trim()); // } IPage page = iSarInterpretationForeignStandardService.page(iPage, queryWrapper); - while(page.getRecords().remove(null)); + while (page.getRecords().remove(null)) ; return Result.success(page); } } } - private static class InsertEntity{ + private static class InsertEntity { List entityList; T eo; } - @ApiOperation(value="（插入/更新）标准清单") + @ApiOperation(value = "（插入/更新）标准清单") @PostMapping("/standard") public ResponseMessage insertStandard(@RequestBody InsertEntity insertEntity) throws InvocationTargetException, IllegalAccessException { @@ -128,27 +128,27 @@ public class SarStandardComplianceAssessResultController { List entityList = new ArrayList<>(); for (int i = 0; i < insertEntity.entityList.size(); i++) { - SarStandardComplianceProductAssess obj=new SarStandardComplianceProductAssess(); + SarStandardComplianceProductAssess obj = new SarStandardComplianceProductAssess(); BeanUtils.populate(obj, insertEntity.entityList.get(i)); entityList.add(obj); } iSarStandardComplianceProductAssessService.saveOrUpdateBatch(entityList); - }else { - if(eo.getPosition()==1){ + } else { + if (eo.getPosition() == 1) { List entityList = new ArrayList<>(); for (int i = 0; i < insertEntity.entityList.size(); i++) { - SarInterpretationNationalStandard obj=new SarInterpretationNationalStandard(); + SarInterpretationNationalStandard obj = new SarInterpretationNationalStandard(); BeanUtils.populate(obj, insertEntity.entityList.get(i)); entityList.add(obj); } iSarInterpretationNationalStandardService.saveOrUpdateBatch(entityList); - }else{ + } else { List entityList = new ArrayList<>(); for (int i = 0; i < insertEntity.entityList.size(); i++) { - SarInterpretationForeignStandard obj=new SarInterpretationForeignStandard(); + SarInterpretationForeignStandard obj = new SarInterpretationForeignStandard(); BeanUtils.populate(obj, insertEntity.entityList.get(i)); entityList.add(obj); } @@ -166,7 +166,7 @@ public class SarStandardComplianceAssessResultController { public ResponseMessage> selectProduct(SarStandardComplianceProductAssessEO eo) throws Exception { IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); QueryWrapper queryWrapper = new QueryWrapper<>(); - if (eo.getType() !=null) queryWrapper.eq("type",eo.getType()); + if (eo.getType() != null) queryWrapper.eq("type", eo.getType()); if (eo.getProductName() != null) queryWrapper.like("product_name", eo.getProductName()); if (eo.getStandId() != null) queryWrapper.like("STAND_ID", eo.getStandId()); if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime()); @@ -192,22 +192,22 @@ public class SarStandardComplianceAssessResultController { @ApiOperation(value = "条件查询技术审核符合性清单") @GetMapping("/interpretation") public ResponseMessage selectNationalStandard(InterpretationEO eo) throws Exception { - if (eo.getPosition()==1) { + if (eo.getPosition() == 1) { IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); QueryWrapper queryWrapper = new QueryWrapper<>(); if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime()); - if(eo.getStandId()!=null)queryWrapper.eq("STAND_ID",eo.getStandId()); + if (eo.getStandId() != null) queryWrapper.eq("STAND_ID", eo.getStandId()); IPage page = iSarInterpretationNationalStandardService.page(iPage, queryWrapper); - while(page.getRecords().remove(null)); + while (page.getRecords().remove(null)) ; return Result.success(page); } else { IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); QueryWrapper queryWrapper = new QueryWrapper<>(); if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime()); - if(eo.getStandId()!=null)queryWrapper.eq("STAND_ID",eo.getStandId()); + if (eo.getStandId() != null) queryWrapper.eq("STAND_ID", eo.getStandId()); IPage page = iSarInterpretationForeignStandardService.page(iPage, queryWrapper); - while(page.getRecords().remove(null)); + while (page.getRecords().remove(null)) ; return Result.success(page); } @@ -220,11 +220,11 @@ public class SarStandardComplianceAssessResultController { InterpretationEO eo = insertEntity.eo; - if (eo.getPosition()==1) { + if (eo.getPosition() == 1) { List entityList = new ArrayList<>(); for (int i = 0; i < insertEntity.entityList.size(); i++) { - SarInterpretationNationalStandard obj=new SarInterpretationNationalStandard(); + SarInterpretationNationalStandard obj = new SarInterpretationNationalStandard(); BeanUtils.populate(obj, insertEntity.entityList.get(i)); entityList.add(obj); } @@ -232,10 +232,9 @@ public class SarStandardComplianceAssessResultController { } else { - List entityList = new ArrayList<>(); for (int i = 0; i < insertEntity.entityList.size(); i++) { - SarInterpretationForeignStandard obj=new SarInterpretationForeignStandard(); + SarInterpretationForeignStandard obj = new SarInterpretationForeignStandard(); BeanUtils.populate(obj, insertEntity.entityList.get(i)); entityList.add(obj); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java index c6496762..4601161e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java @@ -91,10 +91,6 @@ public class SarStandardComplianceProductAssess extends BaseEntity { @ApiModelProperty(value = "在产产品合规信息") private String productionCompliance; - @ApiModelProperty(value = "在产产品不合规信息") - @TableField("production_non_compliance") - private String productionNonCompliance; - @ApiModelProperty(value = "在产产品不合规应对措施") private String productionCountermeasures; @@ -117,10 +113,6 @@ public class SarStandardComplianceProductAssess extends BaseEntity { @TableField("clause_name") private String clauseName; - @ApiModelProperty(value = "流程UUID") - @TableField("type") - private String type; - private String id;