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..c9b1fd24 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 @@ -13,7 +13,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -@FeignClient(value = "bat-wkflow") +@FeignClient(value = "bat-wkflow-wh") //@FeignClient(value = "shan") public interface workFlowFeignClient { diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index d10482d6..930a5c60 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -3,7 +3,7 @@ # 数据库配置 #============================================= spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver -spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false +spring.datasource.url = jdbc:mysql://10.96.10.171 :3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false spring.datasource.username = root spring.datasource.password = root @@ -11,14 +11,14 @@ spring.datasource.password = root #============================================== # 应用设置 -spring.application.name=FotonLAWSSystem +spring.application.name=BAT-WKFLOW-WH application.code=20200101 application.center=1 #============================================== #Eruept eureka.client.allow-redirects=true eureka.client.register-with-eureka=true -eureka.client.service-url.defaultZone=http://101.36.227.25:8761/eureka/ +eureka.client.service-url.defaultZone=http://10.96.10.171:8761/eureka/ #============================================== # 邮箱配置1 @@ -43,7 +43,7 @@ spring.mail.port=587 #spring.rabbitmq.username=uat_pcms #spring.rabbitmq.password=VxsBLL5bJruwzXfS # spring.rabbitmq.publisher-confirms=true -spring.rabbitmq.host=192.168.10.248 +spring.rabbitmq.host=192.168.1.109 spring.rabbitmq.port=5672 spring.rabbitmq.username=ca spring.rabbitmq.password=cs986432 @@ -65,4 +65,4 @@ OCR.ocrPath=D:/APPSOFT/LAWSOCRDEMO/OCRFILE/ # OCR文件请求下载或在线预览时URL OCR.ocrDownPath=http://106.2.13.189:8089/downfile/ OCR.times=20 -OCR.convertType=BOTH \ No newline at end of file +OCR.convertType=BOTH diff --git a/adc-da-main/src/main/resources/application-prod.properties b/adc-da-main/src/main/resources/application-prod.properties index 203e71c7..dd9b39be 100644 --- a/adc-da-main/src/main/resources/application-prod.properties +++ b/adc-da-main/src/main/resources/application-prod.properties @@ -25,14 +25,14 @@ spring.mail.port=587 # ============================================== # rabbitMQ # ============================================== -spring.rabbitmq.host=rabbitmq-cluster-01.vs.test.geely.svc +# +spring.rabbitmq.host=192.168.1.109 spring.rabbitmq.port=5672 -spring.rabbitmq.virtual-host=uat_pcms -spring.rabbitmq.username=uat_pcms -spring.rabbitmq.password=VxsBLL5bJruwzXfS +spring.rabbitmq.username=ca +spring.rabbitmq.password=cs986432 # spring.rabbitmq.publisher-confirms=true # ============================================== # 文档存储路径指向 # ============================================== -file.path=/usr/laws/file/ \ No newline at end of file +file.path=/usr/laws/file/ diff --git a/adc-da-main/src/main/resources/application-test.properties b/adc-da-main/src/main/resources/application-test.properties index 55f14c4b..bf84333a 100644 --- a/adc-da-main/src/main/resources/application-test.properties +++ b/adc-da-main/src/main/resources/application-test.properties @@ -25,14 +25,18 @@ spring.mail.port=587 # ============================================== # rabbitMQ # ============================================== -spring.rabbitmq.host=rabbitmq-cluster-01.vs.test.geely.svc +spring.rabbitmq.host=192.168.1.109 spring.rabbitmq.port=5672 -spring.rabbitmq.virtual-host=uat_pcms -spring.rabbitmq.username=uat_pcms -spring.rabbitmq.password=VxsBLL5bJruwzXfS +spring.rabbitmq.username=ca +spring.rabbitmq.password=cs986432 +#spring.rabbitmq.host=rabbitmq-cluster-01.vs.test.geely.svc +#spring.rabbitmq.port=5672 +#spring.rabbitmq.virtual-host=uat_pcms +#spring.rabbitmq.username=uat_pcms +#spring.rabbitmq.password=VxsBLL5bJruwzXfS # spring.rabbitmq.publisher-confirms=true # ============================================== # 文档存储路径指向 # ============================================== -file.path=/usr/laws/file/ \ No newline at end of file +file.path=/usr/laws/file/ diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index 5b30f553..f1e79d41 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -39,7 +39,7 @@ eureka.client.fetch-registry=true #eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/ #eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/ -eureka.client.service-url.defaultZone=http://101.36.227.25:8761/eureka/ +eureka.client.service-url.defaultZone=http://10.96.10.171:8761/eureka/ # 请求连接的超时时间 默认的时间为 1 秒 ribbon.ConnectTimeout=500000 @@ -146,4 +146,4 @@ elasticsearch.clustername=elasticsearch elasticsearch.ip=192.168.10.47 elasticsearch.port=9300 elasticsearch.poolSize=5 -elas.flag=true \ No newline at end of file +elas.flag=true diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java index 77e9adad..75296465 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java @@ -3,15 +3,14 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.controller; import com.adc.da.att.entity.AttFileEO; import com.adc.da.att.service.IAttFileEOService; -import com.adc.da.http.PageInfo; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.*; import com.adc.da.slrs.sarLawsAttrDetailedList.service.ISarLawsAttrDetailedListService; +import com.adc.da.sys.service.IDicTypeEOService; import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson.JSON; -import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -25,6 +24,7 @@ import java.io.IOException; import java.net.URLEncoder; import java.util.ArrayList; import java.util.List; +import java.util.Map; /** *

@@ -46,6 +46,8 @@ public class SarLawsAttrDetailedListController extends BaseController laws = iSarLawsAttrDetailedList.selectLaws(id,Page-1,Size,standName); + public ResponseMessage selectLawsById(SarFindDto sarFindDto){ + List laws = iSarLawsAttrDetailedList.selectLaws(sarFindDto); return Result.success("200",laws); } @@ -85,6 +87,26 @@ public class SarLawsAttrDetailedListController extends BaseController> map = iSarLawsAttrDetailedList.selectTimes(id); + return Result.success("200",map); + } /** @@ -114,29 +136,120 @@ public class SarLawsAttrDetailedListController extends BaseController map= iDicTypeEOService.getDicTypeListCode(); + List> typeApplicable = (List>)map.get("ENERGYTYPES"); + for (LawsDto list1:data){ + if (StringUtils.isNotBlank(list1.getTypeApplicable()) && list1.getTypeApplicable().contains(",")){ + String[] split = list1.getTypeApplicable().split(","); + StringBuilder builder = new StringBuilder(); + for (String s:split){ + for (Map map1:typeApplicable) { + if (map1.get("value").equals(s)){ + s=map1.get("label"); + builder.append(s+","); + break; + } + } + } + String completedString = builder.delete(builder.length()-1,builder.length()).toString(); + list1.setTypeApplicable(completedString); + }else { + for (Map map1 : typeApplicable) { + if (map1.get("value").equals(list1.getTypeApplicable())) { + list1.setTypeApplicable(map1.get("label")); + break; + } + } } } - List standExcelDtos = new ArrayList<>(); - for (LawsDto lawsDto:data){ - StandExcelDto standExcelDto = StandExcelDto.builder() - .standNumber(lawsDto.getStandNumber()) - .standName(lawsDto.getStandName()) - .standEnName(lawsDto.getStandEnName()) - .typeApplicable(lawsDto.getTypeApplicable()) - .NYLX(lawsDto.getNYLX()) - .putTime(lawsDto.getPutTime()) - .newCarTime(lawsDto.getXCXSSRQGJ()) - .nowCarTime(lawsDto.getZCCSSRQGJ()) - .ZRBM(lawsDto.getZRBM()) - .SYCPX(lawsDto.getSYCPX()) - .CYCVPPSBM(lawsDto.getCYCVPPSBM()) - .CYCVPPSCN(lawsDto.getCYCVPPSCN()) - .KCCVPPSBM(lawsDto.getKCCVPPSBM()) - .KCCVPPSCN(lawsDto.getKCCVPPSCN()) - .build(); + //能源类型 + List> nylx = (List>)map.get("NYLXCLASS"); + for (LawsDto list1:data){ + if (StringUtils.isNotBlank(list1.getNYLX()) && list1.getNYLX().contains(",")){ + String[] split = list1.getNYLX().split(","); + StringBuilder builder = new StringBuilder(); + for (String s:split){ + for (Map map1:nylx) { + if (map1.get("value").equals(s)){ + s=map1.get("label"); + builder.append(s+","); + break; + } + } + } + String completedString = builder.delete(builder.length()-1,builder.length()).toString(); + list1.setNYLX(completedString); + }else { + for (Map map1 : nylx) { + if (map1.get("value").equals(list1.getNYLX())) { + list1.setNYLX(map1.get("label")); + break; + } + } + } + } + //责任部门 + List> zrbn = (List>)map.get("ZRBMCLASS"); + for (LawsDto list1:data){ + if (StringUtils.isNotBlank(list1.getZRBM()) && list1.getZRBM().contains(",")){ + String[] split = list1.getZRBM().split(","); + StringBuilder builder = new StringBuilder(); + for (String s:split){ + for (Map map1:zrbn) { + if (map1.get("value").equals(s)){ + s=map1.get("label"); + builder.append(s+","); + break; + } + } + } + String completedString = builder.delete(builder.length()-1,builder.length()).toString(); + list1.setZRBM(completedString); + }else { + for (Map map1 : zrbn) { + if (map1.get("value").equals(list1.getZRBM())) { + list1.setZRBM(map1.get("label")); + break; + } + } + } + } + //产品线 + List> sycpx = (List>)map.get("SYCPXCLASS"); + for (LawsDto list1:data){ + if (list1.getPutTime()!=null){ + list1.setPutTime(list1.getPutTime().substring(0,10)); + } + if (list1.getZCCSSRQGJ()!=null){ + list1.setZCCSSRQGJ(list1.getZCCSSRQGJ().substring(0,10)); + } + if (list1.getXCXSSRQGJ()!=null){ + list1.setXCXSSRQGJ(list1.getXCXSSRQGJ().substring(0,10)); + } + + if (StringUtils.isNotBlank(list1.getSYCPX()) && list1.getSYCPX().contains(",")){ + String[] split = list1.getSYCPX().split(","); + StringBuilder builder = new StringBuilder(); + for (String s:split){ + for (Map map1:sycpx) { + if (map1.get("value").equals(s)){ + s=map1.get("label"); + builder.append(s+","); + break; + } + } + } + String completedString = builder.delete(builder.length()-1,builder.length()).toString(); + list1.setSYCPX(completedString); + }else { + for (Map map1 : sycpx) { + if (map1.get("value").equals(list1.getSYCPX())) { + list1.setSYCPX(map1.get("label")); + break; + } + } + } } EasyExcel.write(response.getOutputStream(), LawsDto.class).useDefaultStyle(false).autoCloseStream(Boolean.FALSE).sheet("sheet1") .doWrite(data); 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 b4f72493..ed36ebde 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 @@ -2,6 +2,7 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.dao; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.SarLawsAttrDetailedList; +import com.adc.da.slrs.sarLawsAttrDetailedList.entity.StandRegionalTimeDto; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -25,8 +26,8 @@ public interface SarLawsAttrDetailedListDao extends BaseMapper selectLawsById(@Param("param1") List LawsIds, @Param("standName") String standName); //根据标准id查出数据 List selectLawsByIdC(@Param("param1") List LawsIds, @Param("standName") String standName,@Param("standType")String standType); - //查询适用车型 - List selectTypeApplicable(@Param("param1") String LawsId); + //查询时间 + List selectTimes(String standId); List selectLawsId2(String standId); Boolean insertList(@Param("sarLawsAttrDetailedLists") List sarLawsAttrDetailedLists); Boolean deleteByStandId(String standId); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java index e93ed99e..e97d82df 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java @@ -1,7 +1,10 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.entity; +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.format.DateTimeFormat; import com.alibaba.excel.annotation.write.style.ColumnWidth; import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; @@ -12,7 +15,7 @@ import lombok.NoArgsConstructor; /** * //Dto,用于从标准主表中查询和检索信息 - * 主表还未完善需修改 + * * * @author ZhangZhiYuan * date 2021-06-16 @@ -21,6 +24,7 @@ import lombok.NoArgsConstructor; @Data @NoArgsConstructor @AllArgsConstructor +@ExcelIgnoreUnannotated public class LawsDto { @ApiModelProperty(value = "主键") private String id; @@ -42,14 +46,17 @@ public class LawsDto { @ColumnWidth(16) @ExcelProperty(value = "标准实施日期", index = 5) @ApiModelProperty(value = "标准实施日期") + @DateTimeFormat("yyyy年MM月dd日") private String putTime; @ColumnWidth(16) @ExcelProperty(value = "新车型实施日期", index = 6) @ApiModelProperty(value = "新车型实施日期") + @DateTimeFormat("yyyy年MM月dd日") private String XCXSSRQGJ; @ColumnWidth(16) @ExcelProperty(value = "在产车实施日期", index = 7) @ApiModelProperty(value = "在产车实施日期") + @DateTimeFormat("yyyy年MM月dd日") private String ZCCSSRQGJ; @ExcelProperty(value = "责任部门", index = 8) @ApiModelProperty(value = "责任部门") 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 new file mode 100644 index 00000000..1b1af5f2 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java @@ -0,0 +1,31 @@ +package com.adc.da.slrs.sarLawsAttrDetailedList.entity; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.format.DateTimeFormat; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 高级检索 + * + * @author ZhangZhiYuan + * @date 2021-07-22 + */ +@Data +public class SarFindDto { + private int Page; + private int Size; + private String id; + private String standName; + private String standNumber; + private String standEnName; + private String typeApplicable; + private String NYLX; + private String putTime; + private String XCXSSRQGJ; + private String ZCCSSRQGJ; + private String ZRBM; + private String SYCPX; + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarLawsAttrDetailedList.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarLawsAttrDetailedList.java index f3546b89..45dc5441 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarLawsAttrDetailedList.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarLawsAttrDetailedList.java @@ -43,5 +43,16 @@ public class SarLawsAttrDetailedList extends BaseEntity { @TableField(value = "number") private String number; + @ApiModelProperty(value = "标准实施日期") + @TableField(value = "putTime") + private String putTime; + + @ApiModelProperty(value = "新车型实施日期") + @TableField(value = "xcxssrq") + private String xcxssrq; + + @ApiModelProperty(value = "在产车实施日期") + @TableField(value = "zccssrq") + private String zccssrq; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java new file mode 100644 index 00000000..9bdae697 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java @@ -0,0 +1,22 @@ +package com.adc.da.slrs.sarLawsAttrDetailedList.entity; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * //TODO 添加类、接口描述 + * + * @author ZhangZhiYuan + * @date 2021-07-21 + */ +@Data +public class StandRegionalTimeDto { + @ApiModelProperty(value = "国家") + private String country; + @ApiModelProperty(value = "实施日期") + private String putTime; + @ApiModelProperty(value = "在产车实施日期") + private String zccssrq; + @ApiModelProperty(value = "新车型实施日期") + private String xcxssrq; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandTimeDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandTimeDto.java new file mode 100644 index 00000000..9d3d62fe --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandTimeDto.java @@ -0,0 +1,20 @@ +package com.adc.da.slrs.sarLawsAttrDetailedList.entity; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * //TODO 添加类、接口描述 + * + * @author ZhangZhiYuan + * @date 2021-07-21 + */ +@Data +public class StandTimeDto { + @ApiModelProperty(value = "实施日期") + private String putTime; + @ApiModelProperty(value = "在产车实施日期") + private String zccssrq; + @ApiModelProperty(value = "新车型实施日期") + private String xcxssrq; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/ISarLawsAttrDetailedListService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/ISarLawsAttrDetailedListService.java index 4edd0d76..fa891d9a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/ISarLawsAttrDetailedListService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/ISarLawsAttrDetailedListService.java @@ -1,12 +1,12 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.service; -import com.adc.da.slrs.sarLawsAttrDetailedList.entity.SarLawsAttrDetailedList; -import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto; -import com.adc.da.slrs.sarLawsAttrDetailedList.entity.StandExcelVo; +import com.adc.da.slrs.sarLawsAttrDetailedList.entity.*; +import com.adc.da.slrs.sarLawsDetailedList.entity.TimeDto; import com.baomidou.mybatisplus.extension.service.IService; import javax.servlet.http.HttpServletResponse; import java.util.List; +import java.util.Map; /** *

@@ -18,8 +18,10 @@ import java.util.List; */ public interface ISarLawsAttrDetailedListService extends IService { - List selectLaws(String standId, Integer Page, Integer Size,String standName); - Boolean insertDetailedList(String id,String[] lawsIds); - Boolean updateDetailedLaws(String id,String[] lawsIds); + List selectLaws(SarFindDto sarFindDto); + Boolean insertDetailedList(String id,List timeDto); + Boolean updateDetailedLaws(String id,List timeDtos); void exportExcel(HttpServletResponse response, StandExcelVo standExcelVo); + int setTimes(SarLawsAttrDetailedList sarLawsAttrDetailedList); + Map> selectTimes(String id); } 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 9b3f4cc5..6dfd5fbf 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 @@ -1,10 +1,10 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.service.impl; import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao; -import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto; -import com.adc.da.slrs.sarLawsAttrDetailedList.entity.SarLawsAttrDetailedList; -import com.adc.da.slrs.sarLawsAttrDetailedList.entity.StandExcelVo; +import com.adc.da.slrs.sarLawsAttrDetailedList.entity.*; import com.adc.da.slrs.sarLawsAttrDetailedList.service.ISarLawsAttrDetailedListService; +import com.adc.da.slrs.sarLawsDetailedList.entity.TimeDto; +import com.adc.da.sys.service.IDicTypeEOService; import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -16,7 +16,9 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** *

@@ -31,19 +33,107 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl selectLaws(String standId, Integer Page, Integer Size,String standName) { - List lawsIds = sarLawsAttrDetailedListDao.selectLawsId(standId,Page,Size); + public List selectLaws(SarFindDto sarFindDto) { + List lawsIds = sarLawsAttrDetailedListDao.selectLawsId(sarFindDto.getId(),(sarFindDto.getPage())-1,sarFindDto.getSize()); if (CollectionUtils.isEmpty(lawsIds)){ return null; } - List list = sarLawsAttrDetailedListDao.selectLawsById(lawsIds,standName); + List list = sarLawsAttrDetailedListDao.selectLawsById(lawsIds,sarFindDto.getStandName()); for (LawsDto lawsDto:list){ - if (sarLawsAttrDetailedListDao.selectTypeApplicable(lawsDto.getId()).size()!=0){ - lawsDto.setTypeApplicable(StringUtils.join(sarLawsAttrDetailedListDao.selectTypeApplicable(lawsDto.getId()), ",")); - System.out.println(StringUtils.join(sarLawsAttrDetailedListDao.selectTypeApplicable(lawsDto.getId()), ",")); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("stand_id",lawsDto.getId()) + .eq("detailed_list_id",sarFindDto.getId()); + List sarLawsAttrDetailedLists = sarLawsAttrDetailedListDao.selectList(queryWrapper); + if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getPutTime())){ + lawsDto.setPutTime(sarLawsAttrDetailedLists.get(0).getPutTime()); + } + if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getXcxssrq())){ + lawsDto.setXCXSSRQGJ(sarLawsAttrDetailedLists.get(0).getXcxssrq()); + } + if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getZccssrq())){ + lawsDto.setZCCSSRQGJ(sarLawsAttrDetailedLists.get(0).getZccssrq()); + } + } + //适用车型 + Map map= iDicTypeEOService.getDicTypeListCode(); + List> typeApplicable = (List>)map.get("ENERGYTYPES"); + for (LawsDto list1:list){ + if (StringUtils.isNotBlank(list1.getTypeApplicable()) && list1.getTypeApplicable().contains(",")){ + String[] split = list1.getTypeApplicable().split(","); + StringBuilder builder = new StringBuilder(); + for (String s:split){ + for (Map map1:typeApplicable) { + if (map1.get("value").equals(s)){ + s=map1.get("label"); + builder.append(s+","); + break; + } + } + } + String completedString = builder.delete(builder.length()-1,builder.length()).toString(); + list1.setTypeApplicable(completedString); + } + } + //能源类型 + List> nylx = (List>)map.get("NYLXCLASS"); + for (LawsDto list1:list){ + if (StringUtils.isNotBlank(list1.getNYLX()) && list1.getNYLX().contains(",")){ + String[] split = list1.getNYLX().split(","); + StringBuilder builder = new StringBuilder(); + for (String s:split){ + for (Map map1:nylx) { + if (map1.get("value").equals(s)){ + s=map1.get("label"); + builder.append(s+","); + break; + } + } + } + String completedString = builder.delete(builder.length()-1,builder.length()).toString(); + list1.setNYLX(completedString); + } + } + //责任部门 + List> zrbn = (List>)map.get("ZRBMCLASS"); + for (LawsDto list1:list){ + if (StringUtils.isNotBlank(list1.getZRBM()) && list1.getZRBM().contains(",")){ + String[] split = list1.getZRBM().split(","); + StringBuilder builder = new StringBuilder(); + for (String s:split){ + for (Map map1:zrbn) { + if (map1.get("value").equals(s)){ + s=map1.get("label"); + builder.append(s+","); + break; + } + } + } + String completedString = builder.delete(builder.length()-1,builder.length()).toString(); + list1.setZRBM(completedString); + } + } + //产品线 + List> sycpx = (List>)map.get("SYCPXCLASS"); + for (LawsDto list1:list){ + if (StringUtils.isNotBlank(list1.getSYCPX()) && list1.getSYCPX().contains(",")){ + String[] split = list1.getSYCPX().split(","); + StringBuilder builder = new StringBuilder(); + for (String s:split){ + for (Map map1:sycpx) { + if (map1.get("value").equals(s)){ + s=map1.get("label"); + builder.append(s+","); + break; + } + } + } + String completedString = builder.delete(builder.length()-1,builder.length()).toString(); + list1.setSYCPX(completedString); } } return list; @@ -51,17 +141,20 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl timeDto) { + if (null !=timeDto && !timeDto.isEmpty()){ try { List attrDetailedLists = new ArrayList<>(); int a=0; - for (String lawsId:lawsIds){ + for (TimeDto timeDto1:timeDto){ SarLawsAttrDetailedList sarLawsAttrDetailedList = SarLawsAttrDetailedList.builder() .id(UUIDUtils.randomUUID20()) - .standId(lawsId) + .standId(timeDto1.getStandId()) .detailedListId(standId) .number(String.valueOf(a)) + .putTime(timeDto1.getPutTime()) + .xcxssrq(timeDto1.getXcxssrqgj()) + .zccssrq(timeDto1.getZccssrqgj()) .build(); attrDetailedLists.add(sarLawsAttrDetailedList); a++; @@ -77,12 +170,12 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl timeDto) { try { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("detailed_list_id",id); sarLawsAttrDetailedListDao.delete(wrapper); - insertDetailedList(id,lawsIds); + insertDetailedList(id,timeDto); return true; } catch (Exception e) { return false; @@ -94,5 +187,31 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl> selectTimes(String id) { + List standRegionalTimeDto= sarLawsAttrDetailedListDao.selectTimes(id); + Map> mapList = new HashMap>(); + for (StandRegionalTimeDto s:standRegionalTimeDto){ + List list; + if (mapList.containsKey(s.getCountry())){ + list = mapList.get(s.getCountry()); + }else { + list = new ArrayList<>(); + } + StandTimeDto standTimeDto = new StandTimeDto(); + standTimeDto.setPutTime(s.getPutTime()); + standTimeDto.setXcxssrq(s.getXcxssrq()); + standTimeDto.setZccssrq(s.getZccssrq()); + list.add(standTimeDto); + mapList.put(s.getCountry(),list); + } + return mapList; + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java index e4867a6a..eeaa8d2c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java @@ -65,7 +65,7 @@ public class SarLawsDetailedListController extends BaseController Ids; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/TimeDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/TimeDto.java new file mode 100644 index 00000000..e7660013 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/TimeDto.java @@ -0,0 +1,28 @@ +package com.adc.da.slrs.sarLawsDetailedList.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * //TODO 添加类、接口描述 + * + * @author ZhangZhiYuan + * @date 2021-07-21 + */ +@Data +public class TimeDto { + @ApiModelProperty(value = "标准id") + private String standId; + + @ApiModelProperty(value = "实施日期") + private String putTime; + + @ApiModelProperty(value = "在产车实施日期") + private String zccssrqgj; + + @ApiModelProperty(value = "新车型实施日期") + private String xcxssrqgj; + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java index 66bb8d75..e9e145da 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java @@ -8,6 +8,7 @@ import com.adc.da.slrs.sarLawsDetailedList.dao.SarLawsDetailedListDao; import com.adc.da.slrs.sarLawsDetailedList.entity.AddDetailedDto; import com.adc.da.slrs.sarLawsDetailedList.entity.SarLawsDetailedList; import com.adc.da.slrs.sarLawsDetailedList.entity.DetailedUpDto; +import com.adc.da.slrs.sarLawsDetailedList.entity.TimeDto; import com.adc.da.slrs.sarLawsDetailedList.service.ISarLawsDetailedListService; import com.adc.da.sys.service.IDicTypeEOService; import com.adc.da.util.UUIDUtils; @@ -89,8 +90,42 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl timeDto = new ArrayList<>(); + if (addDetailedDto.getInforlist().indexOf(",") >= 0){ + String[] id = addDetailedDto.getInforlist().split(","); + String[] putTime = addDetailedDto.getInforlist1().split(","); + String[] zcc = addDetailedDto.getInforlist2().split(","); + String[] xcx = addDetailedDto.getInforlist3().split(","); + for (int a =0;a< id.length;a++){ + TimeDto dto = new TimeDto(); + dto.setStandId(id[a]); + if ("\"".equals(putTime[a])){ + dto.setPutTime(null); + }else { + dto.setPutTime(putTime[a]); + } + if ("\"".equals(putTime[a])){ + dto.setXcxssrqgj(null); + }else { + dto.setXcxssrqgj(xcx[a]); + } + if ("\"".equals(putTime[a])){ + dto.setZccssrqgj(null); + }else { + dto.setZccssrqgj(zcc[a]); + } + timeDto.add(dto); + } + }else { + TimeDto dto = new TimeDto(); + dto.setStandId(addDetailedDto.getInforlist()); + dto.setPutTime(addDetailedDto.getInforlist1()); + dto.setXcxssrqgj(addDetailedDto.getInforlist2()); + dto.setZccssrqgj(addDetailedDto.getInforlist3()); + timeDto.add(dto); + } + + service.insertDetailedList(sarLawsDetailedList.getId(),timeDto); } catch (Exception e) { e.printStackTrace(); @@ -194,11 +229,42 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl timeDto = new ArrayList<>(); + if (detailedUpDto.getInforlist().indexOf(",") >= 0){ + String[] id = detailedUpDto.getInforlist().split(","); + String[] putTime = detailedUpDto.getInforlist1().split(","); + String[] zcc = detailedUpDto.getInforlist2().split(","); + String[] xcx = detailedUpDto.getInforlist3().split(","); + for (int a =0;a< id.length;a++){ + TimeDto dto = new TimeDto(); + dto.setStandId(id[a]); + if ("\"".equals(putTime[a])){ + dto.setPutTime(null); + }else { + dto.setPutTime(putTime[a]); + } + if ("\"".equals(putTime[a])){ + dto.setXcxssrqgj(null); + }else { + dto.setXcxssrqgj(xcx[a]); + } + if ("\"".equals(putTime[a])){ + dto.setZccssrqgj(null); + }else { + dto.setZccssrqgj(zcc[a]); + } + timeDto.add(dto); + } + }else { + TimeDto dto = new TimeDto(); + dto.setStandId(detailedUpDto.getInforlist()); + dto.setPutTime(detailedUpDto.getInforlist1()); + dto.setXcxssrqgj(detailedUpDto.getInforlist2()); + dto.setZccssrqgj(detailedUpDto.getInforlist3()); + timeDto.add(dto); } + service.updateDetailedLaws(detailedUpDto.getId(), timeDto); return "修改成功"; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index c4e545c4..25152da2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -150,12 +150,6 @@ public class SarStandItemsServiceImpl extends ServiceImpl page1=new Page<>(); page1.setRecords(list); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java index 9ed080b6..5d7791d0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java @@ -6,9 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import org.springframework.web.bind.annotation.RequestParam; - -import java.util.List; +import org.apache.ibatis.annotations.Mapper; /** *

@@ -18,6 +16,9 @@ import java.util.List; * @author super_liu * @since 2021-06-15 */ +@Mapper public interface SarStandUnqualifiedDao extends BaseMapper { IPage getAllDatasByPage(Page page,@Param("sar") SarStandUnqualifiedPage sarStandUnqualified); + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java index 11e9a2dd..1c73a0d7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java @@ -10,10 +10,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - +import org.springframework.stereotype.Service; import java.sql.Timestamp; import java.time.LocalDateTime; import java.util.ArrayList; @@ -40,28 +41,28 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) { -// QueryWrapper sarStandUnqualifiedQueryWrapper=new QueryWrapper<>(); -// if(sarStandUnqualifiedPage.getStandId()!=null){ -// sarStandUnqualifiedQueryWrapper.and(wrapper->wrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%")); -//// sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%"); -// } -// //仅查询未关闭的 -// sarStandUnqualifiedQueryWrapper.eq("close_state",1); -// if(sarStandUnqualifiedPage.getProductName()!=null){ -// sarStandUnqualifiedQueryWrapper.like("product_name","%"+sarStandUnqualifiedPage.getProductName()+"%"); -// } -// if(sarStandUnqualifiedPage.getResponsibleUnit()!=null){ -// sarStandUnqualifiedQueryWrapper.eq("responsible_unit",sarStandUnqualifiedPage.getResponsibleUnit()); -// } -// Page standUnqualifiedPage=new Page<>(); -// //判断前端是否提供页码和每页条数 -// if(sarStandUnqualifiedPage.getCurrent()!=null&&sarStandUnqualifiedPage.getSize()!=null){ -// standUnqualifiedPage=new Page<>(sarStandUnqualifiedPage.getCurrent(),sarStandUnqualifiedPage.getSize()); -// } - Page pag = new Page(); - pag.setCurrent(sarStandUnqualifiedPage.getCurrent()).setSize(sarStandUnqualifiedPage.getSize()); - - return sarStandUnqualifiedDao.getAllDatasByPage(pag,sarStandUnqualifiedPage); + QueryWrapper sarStandUnqualifiedQueryWrapper=new QueryWrapper<>(); + if(sarStandUnqualifiedPage.getStandId()!=null){ + sarStandUnqualifiedQueryWrapper + .like("stand_id",sarStandUnqualifiedPage.getStandId()) + .like("stand_name",sarStandUnqualifiedPage.getStandId()); +// sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%"); + } + //仅查询未关闭的 + sarStandUnqualifiedQueryWrapper.eq("close_state",1); + if(sarStandUnqualifiedPage.getProductName()!=null){ + sarStandUnqualifiedQueryWrapper.like("product_name",sarStandUnqualifiedPage.getProductName()); + } + if(sarStandUnqualifiedPage.getResponsibleUnit()!=null){ + sarStandUnqualifiedQueryWrapper.eq("responsible_unit",sarStandUnqualifiedPage.getResponsibleUnit()); + } + Page standUnqualifiedPage=new Page<>(); + //判断前端是否提供页码和每页条数 + if(sarStandUnqualifiedPage.getCurrent()!=null + && sarStandUnqualifiedPage.getSize()!=null){ + standUnqualifiedPage=new Page<>(sarStandUnqualifiedPage.getCurrent(),sarStandUnqualifiedPage.getSize()); + } + return sarStandUnqualifiedDao.selectPage(standUnqualifiedPage,sarStandUnqualifiedQueryWrapper); } /** @@ -73,14 +74,14 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl getSarStandUnqualifiedHistoryPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) { QueryWrapper sarStandUnqualifiedQueryWrapper=new QueryWrapper<>(); if(sarStandUnqualifiedPage.getStandId()!=null){ - sarStandUnqualifiedQueryWrapper.and(wrapper->wrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%")); + sarStandUnqualifiedQueryWrapper.and(wrapper->wrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name",sarStandUnqualifiedPage.getStandId())); // sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%"); } //仅查询关闭的 sarStandUnqualifiedQueryWrapper.eq("close_state",2); if(sarStandUnqualifiedPage.getProductName()!=null){ - sarStandUnqualifiedQueryWrapper.like("product_name","%"+sarStandUnqualifiedPage.getProductName()+"%"); + sarStandUnqualifiedQueryWrapper.like("product_name",sarStandUnqualifiedPage.getProductName()); } if(sarStandUnqualifiedPage.getResponsibleUnit()!=null){ sarStandUnqualifiedQueryWrapper.eq("responsible_unit",sarStandUnqualifiedPage.getResponsibleUnit()); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml index 778c1d91..b8a5e760 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml @@ -3,7 +3,7 @@