diff --git a/adc-da-main/pom.xml b/adc-da-main/pom.xml index cf4b3bc8..57f23e42 100644 --- a/adc-da-main/pom.xml +++ b/adc-da-main/pom.xml @@ -24,6 +24,11 @@ org.springframework.boot spring-boot-starter + + + org.springframework + spring-context-support + com.adc adc-da-convert diff --git a/adc-da-main/src/main/java/com/adc/da/AdcDaApplication.java b/adc-da-main/src/main/java/com/adc/da/AdcDaApplication.java index 1310d5ab..52969ab4 100644 --- a/adc-da-main/src/main/java/com/adc/da/AdcDaApplication.java +++ b/adc-da-main/src/main/java/com/adc/da/AdcDaApplication.java @@ -12,11 +12,13 @@ import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerF import org.springframework.cloud.netflix.eureka.EnableEurekaClient; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.Bean; +import org.springframework.scheduling.annotation.EnableScheduling; @EnableEurekaClient @EnableFeignClients @ServletComponentScan @SpringBootApplication(exclude = SecurityAutoConfiguration.class) +@EnableScheduling @MapperScan(value = {"com.adc.da.file.store"}) public class AdcDaApplication { diff --git a/adc-da-main/src/main/java/com/adc/da/main/config/MyConfiguration.java b/adc-da-main/src/main/java/com/adc/da/main/config/MyConfiguration.java new file mode 100644 index 00000000..29cf1a0f --- /dev/null +++ b/adc-da-main/src/main/java/com/adc/da/main/config/MyConfiguration.java @@ -0,0 +1,25 @@ +package com.adc.da.main.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; + +/** + * @Description: TODO + * @author: super_liu + * @date: 2021年08月19日 11:28 + */ +@Configuration +public class MyConfiguration implements WebMvcConfigurer { + + @Override + public void addCorsMappings(CorsRegistry registry) { + registry.addMapping("/**") + .allowedOrigins("*") + .allowCredentials(true) + .allowedMethods("GET", "POST", "DELETE", "PUT") + .maxAge(3600); + } +} \ No newline at end of file diff --git a/adc-da-main/src/main/java/com/adc/da/main/config/RestTemplateConfig.java b/adc-da-main/src/main/java/com/adc/da/main/config/RestTemplateConfig.java index 8b91a64b..795933c3 100644 --- a/adc-da-main/src/main/java/com/adc/da/main/config/RestTemplateConfig.java +++ b/adc-da-main/src/main/java/com/adc/da/main/config/RestTemplateConfig.java @@ -2,6 +2,7 @@ package com.adc.da.main.config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.boot.web.client.RestTemplateBuilder; import org.springframework.cloud.client.loadbalancer.LoadBalanced; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -26,20 +27,8 @@ public class RestTemplateConfig { @Bean @LoadBalanced - public RestTemplate restTemplate(ClientHttpRequestFactory factory){ - RestTemplate restTemplate = new RestTemplate(factory); - // 使用 utf-8 编码集的 conver 替换默认的 conver（默认的 string conver 的编码集为"ISO-8859-1"） - List> messageConverters = restTemplate.getMessageConverters(); - Iterator> iterator = messageConverters.iterator(); - while (iterator.hasNext()) { - HttpMessageConverter converter = iterator.next(); - if (converter instanceof StringHttpMessageConverter) { - iterator.remove(); - } - } - messageConverters.add(new StringHttpMessageConverter(Charset.forName("UTF-8"))); - - return restTemplate; + public RestTemplate restTemplate(RestTemplateBuilder builder){ + return builder.build(); } @Bean diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index 50c4225d..b7b6adb0 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -152,3 +152,8 @@ elas.flag=true # 文档转换TCP通讯地址 convert.host=127.0.0.1 #convert.host=0.0.0.0 + +# ============================================================================= +# scheduled 配置 +# ============================================================================= +isNotScheduled=false \ No newline at end of file diff --git a/adc-da-slrs/pom.xml b/adc-da-slrs/pom.xml index cb647b83..951b761a 100644 --- a/adc-da-slrs/pom.xml +++ b/adc-da-slrs/pom.xml @@ -11,6 +11,11 @@ adc-da-slrs + + + org.springframework + spring-context-support + com.adc adc-da-base diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java new file mode 100644 index 00000000..0937f48d --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java @@ -0,0 +1,38 @@ +package com.adc.da.scheduled; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.scheduling.annotation.Async; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.util.Date; + +@EnableScheduling +@Component +@Slf4j +public class ScheduledJob { + + /** + * 根据配置文件设置是否开启定时器 + */ + + @Value("${isNotScheduled}") + private boolean isNotScheduled; //是否开启定时器 + + + @Scheduled(cron="*/5 * * * * ?") + @Async + public void StandScheduledJob(){ + if(isNotScheduled){ + System.out.println(Thread.currentThread().getName() + " cron=0 0 1 1 * ? --- " + new Date()+"---START-01"); + System.out.println(Thread.currentThread().getName() + " cron=0 0 1 1 * ? --- " + new Date()+"---End-01"); + try{ + Thread.sleep(2000); + }catch(Exception e){ + } + } + } +} 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 2ff5fc7c..4307db71 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); + List selectLawsId(@Param("standId") String standId,@Param("param3") Integer page,@Param("param2") Integer size,@Param("sar") SarFindDto sarFindDto); //根据标准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 06dc3d5d..db12a5b6 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,5 +23,8 @@ 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/service/impl/SarLawsAttrDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java index a733b867..9028d493 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()); + List lawsIds = sarLawsAttrDetailedListDao.selectLawsId(sarFindDto.getId(),(sarFindDto.getPage())-1,sarFindDto.getSize(),sarFindDto); if (CollectionUtils.isEmpty(lawsIds)){ return null; } 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 c0ad920e..146af0f1 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 @@ -117,6 +117,9 @@ public class SarLawsDetailedListController extends BaseController publicList = new Page<>(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java index 47f55aad..4c9dee62 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java @@ -16,6 +16,8 @@ public class AddDetailedDto { private String countryArea; @ApiModelProperty(value = "项目名称") private String projectName; + @ApiModelProperty(value = "车型类别") + private String carType; @ApiModelProperty(value = "清单类别") private String detailedList; @ApiModelProperty(value = "区分，国家地区为1，项目名称为2，清单类别为3") @@ -40,6 +42,4 @@ public class AddDetailedDto { private String inforlist2; @ApiModelProperty(value = "新车型实施时间") private String inforlist3; - @ApiModelProperty(value = "车辆类别") - private String carType; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/DetailedUpDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/DetailedUpDto.java index 6689b0f9..a0238fc1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/DetailedUpDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/DetailedUpDto.java @@ -23,6 +23,9 @@ public class DetailedUpDto { @ApiModelProperty(value = "项目名称") private String projectName; + @ApiModelProperty(value = "车型类别") + private String carType; + @ApiModelProperty(value = "清单类别") private String detailedList; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/SarLawsDetailedList.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/SarLawsDetailedList.java index beec8129..c1baf926 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/SarLawsDetailedList.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/SarLawsDetailedList.java @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; /** *

- * + * *

* * @author szc @@ -41,6 +41,10 @@ public class SarLawsDetailedList extends BaseEntity { @TableField("project_name") private String projectName; + @ApiModelProperty(value = "车型类别") + @TableField("car_type") + private String carType; + @ApiModelProperty(value = "清单类别") @TableField("detailed_list") private String detailedList; @@ -81,8 +85,5 @@ public class SarLawsDetailedList extends BaseEntity { @TableField("file_id") private String fileIds; - @ApiModelProperty(value = "附件id") - @TableField("car_type") - private String carType; } 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 f5698ab9..23fe19ab 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 @@ -60,6 +60,149 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); + wrapper.select("DISTINCT country_area,car_type"); + List sarLawsDetailedLists = sarLawsDetailedListDao.selectList(wrapper); + //国家/地区清单 多选是否可以添加的标识，true表示可以添加，false表示不许添加 + boolean multiAddFlag = true; + //国家/地区清单 单选是否可以添加的标识，true表示可以添加，false表示不许添加 + boolean singleAddFlag = true; + //车型类别是否可以添加的标识，true表示可以添加，false表示不许添加 + boolean carAddFlag = true; +// System.out.println("数据库的值"+sarLawsDetailedLists); +// System.out.println("数据库里有多少条数据"+sarLawsDetailedLists.size()); +// System.out.println("数据库里第一条"+sarLawsDetailedLists.get(1)); + //先判断数据库里有没有值，如果没有，就直接新增 + if (sarLawsDetailedLists.size() == 0) { + //下面放添加的具体方法 + newListMethod(addDetailedDto); + return "数据库为空，添加成功"; + } + //如果数据库有值，根据页面的字段进行判断是哪个清单的新增 + else { + //如果是其他新增 + if (addDetailedDto.getCountryArea() == null && addDetailedDto.getCarType() == null) { + //下面放添加的具体方法 + newListMethod(addDetailedDto); + return "其他清单添加成功"; + } + //如果是车辆新增 + else if (addDetailedDto.getCarType() != null) { + //就判断页面的值和数据库里的值是否相等 + for (int i = 0; i < sarLawsDetailedLists.size(); i++) { + //判断数据库里的数据的车型类别字段是否为空 + if (null == sarLawsDetailedLists.get(i) || null == sarLawsDetailedLists.get(i).getCarType()){ + System.out.println("数据库里第" + (i + 1) + "条的车型类别字段长度为空，不重复，目前可以添加"); + } + //相等就不许添加 + else if (Objects.equals(addDetailedDto.getCarType(), sarLawsDetailedLists.get(i).getCarType())) { + System.out.println("数据库里第" + (i + 1) + "条的车型类别字段和页面一样，重复，不许添加"); + carAddFlag = false; + } + } + } + //如果是国家新增 + else if (addDetailedDto.getCountryArea() != null) { + for (int i = 0; i < sarLawsDetailedLists.size(); i++) { + //就先判断数据库里的数据的国家/地区字段是否为空 + if (null == sarLawsDetailedLists.get(i) || null == sarLawsDetailedLists.get(i).getCountryArea()) { + System.out.println("数据库里第" + (i + 1) + "条的国家地区字段长度为空，不重复，目前可以添加"); + } + //再判断页面字段长度是否与数据库里的长度一样，如果长度不一样，允许新增 + else if (addDetailedDto.getCountryArea().length() != sarLawsDetailedLists.get(i).getCountryArea().length()) { + System.out.println("数据库里第" + (i + 1) + "条的国家地区字段长度和页面的国家地区字段长度不一样，不重复，目前可以添加"); + } + //如果不为空且长度一样 + else { + //判断页面的国家地区是单选还是多选（判断能不能拆） + if (addDetailedDto.getCountryArea().contains(",")) { + System.out.println("页面是多选"); + //如果数据库里的国家地区字段存在",",说明是多选，如果不存在说明是单选 + if (sarLawsDetailedLists.get(i).getCountryArea().contains(",")) { + System.out.println("数据库是多选，如果页面字段拆分之后都包含于数据库字段拆分之后，则说明重复，目前不许添加"); + System.out.println("页面字段为" + addDetailedDto.getCountryArea()); + //页面字段以“，”为分隔符拆分后的结果 + String[] frontCountryArea = addDetailedDto.getCountryArea().split(","); + //数据库字段以“，”为分隔符拆分后的结果 + String[] databaseCountryArea = sarLawsDetailedLists.get(i).getCountryArea().split(","); + + //如果页面字段拆分之后都包含于数据库字段拆分之后，则说明重复，不许添加 + for (int j = 0; j < frontCountryArea.length; j++) { + //如果数据库包含了页面字段的所有值，说明这俩完全相同，重复，不许添加 + List databaseCountryAreaList = Arrays.asList(databaseCountryArea); + if (databaseCountryAreaList.contains(frontCountryArea[j])) { + System.out.println("数据库" + databaseCountryAreaList); + System.out.println("页面" + frontCountryArea[j]); + System.out.println("数据库里的字段包含页面里的字段，可能重复，目前不许添加"); + multiAddFlag = false; + } else { + System.out.println("数据库" + databaseCountryAreaList); + System.out.println("页面" + frontCountryArea[j]); + System.out.println("数据库里的字段和页面字段虽然长度相同，但是里面有不一样的元素，可以添加"); + multiAddFlag = true; + } + } + if (multiAddFlag == true) { + System.out.println("长度相同，只要有一个不重复，就可以添加"); + } else { + System.out.println("长度相同，整个循环下来都重复，说明两个字段重复，不许添加"); + break; + } + } + } else { + System.out.println("页面是单选"); + + //如果数据库里的国家地区字段存在",",说明是多选，如果不存在说明是单选 + if (sarLawsDetailedLists.get(i).getCountryArea().contains(",")) { + System.out.println("数据库是多选，肯定不重复，目前可以添加"); + } else { + System.out.println("数据库是单选，如果数据库里的字段和页面的字段相等，重复，不许添加"); + //如果数据库里的字段和页面的字段相等，重复，不许添加 + if (Objects.equals(sarLawsDetailedLists.get(i).getCountryArea(), addDetailedDto.getCountryArea())) { + System.out.println("数据库里的字段和页面的字段相等，重复，不许添加"); + singleAddFlag = false; + break; + } else { + System.out.println("数据库里的字段和页面的字段不相等，不重复，允许添加"); + } + } + } + } + } + } + } + //如果是国家和车型清单 + //如果整个循环下来都没有重复，则可以添加，不然就说明有重复，不能添加 + if (carAddFlag == true && multiAddFlag == true && singleAddFlag == true) { + //下面放添加的具体方法 + newListMethod(addDetailedDto); + return "车型类别清单添加成功"; + //添加方法结束 + } else if (carAddFlag == false){ + //0表示添加成功，1表示添加失败 + return "车型类别清单添加失败"; + } + + //如果循环完整个数据库，都没有重复使当前数据无法添加，则添加 + if (multiAddFlag == true && singleAddFlag == true && carAddFlag == true) { + //下面放添加的具体方法 + newListMethod(addDetailedDto); + //0表示添加成功，1表示添加失败 + return "国家/地区清单添加成功"; + //添加方法结束 + } else { + //0表示添加成功，1表示添加失败 + return "国家/地区清单添加失败"; + } + } + + /** + * 具体用来新增清单的方法 + * + * @param addDetailedDto + */ + private void newListMethod(AddDetailedDto addDetailedDto) { try { SarLawsDetailedList sarLawsDetailedList = SarLawsDetailedList.builder() .id(UUIDUtils.randomUUID20()) @@ -72,7 +215,6 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl timeDto = new ArrayList<>(); switch (addDetailedDto.getSortKey()) { @@ -81,7 +223,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl AllSelectD(Integer page, Integer pageSize, String sortKey, - String countryArea, String projectName, - String detailedList, String detailedListName,String carType) { + String countryArea, String projectName, String carType, + String detailedList, String detailedListName) { QueryWrapper wrapper = new QueryWrapper<>(); if ("1".equals(sortKey)) { wrapper.like(StringUtils.isNotEmpty(countryArea), "country_area", countryArea). like(StringUtils.isNotEmpty(detailedListName), "detailed_list_name", detailedListName); } else if ("2".equals(sortKey)) { - wrapper.like(StringUtils.isNotEmpty(projectName), "project_name", projectName). - like(StringUtils.isNotEmpty(detailedListName), "detailed_list_name", detailedListName). - like(StringUtils.isNotEmpty(carType), "car_type", carType); + wrapper.like(StringUtils.isNotEmpty(carType), "car_type", carType). + like(StringUtils.isNotEmpty(detailedListName), "detailed_list_name", detailedListName); } else if ("3".equals(sortKey)) { wrapper.like(StringUtils.isNotEmpty(detailedList), "detailed_list", detailedList). @@ -178,11 +320,14 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl0) { + completedString = builder.delete(builder.length() - 1, builder.length()).toString(); + } list1.setCountryArea(completedString); - }else { - for (Map map1:arr) { - if (map1.get("value").equals(list1.getCountryArea())){ + } else { + for (Map map1 : arr) { + if (map1.get("value").equals(list1.getCountryArea())) { list1.setCountryArea(map1.get("label")); break; } @@ -198,49 +343,53 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl timeDto = new ArrayList<>(); - if ( detailedUpDto.getInforlist().contains(",")) { + if (detailedUpDto.getInforlist().contains(",")) { String[] id = detailedUpDto.getInforlist().split(","); - String[] ssrq = detailedUpDto.getInforlist1().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 (ssrq.length<=a) { - dto.setSsrq(null); - } else { - dto.setSsrq(ssrq[a]); - } - if (ssrq.length<=a) { - dto.setXcxssrqgj(null); - } else { - dto.setXcxssrqgj(xcx[a]); - } - if (ssrq.length<=a) { - dto.setZccssrqgj(null); - } else { - dto.setZccssrqgj(zcc[a]); - } - timeDto.add(dto); + for (int a = 0; a < id.length; a++) { + TimeDto dto = new TimeDto(); + dto.setStandId(id[a]); + if (putTime.length <= a) { + dto.setSsrq(null); + } else { + dto.setSsrq(putTime[a]); } + if (putTime.length <= a) { + dto.setXcxssrqgj(null); + } else { + dto.setXcxssrqgj(xcx[a]); + } + if (putTime.length <= a) { + dto.setZccssrqgj(null); + } else { + dto.setZccssrqgj(zcc[a]); + } + timeDto.add(dto); + } } else { TimeDto dto = new TimeDto(); dto.setStandId(detailedUpDto.getInforlist()); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/controller/TsResourceController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/controller/TsResourceController.java index c8bd1e35..c628e70f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/controller/TsResourceController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/controller/TsResourceController.java @@ -26,6 +26,7 @@ import java.util.stream.Collectors; * @since 2021-06-30 */ @RestController +@CrossOrigin @Api(tags = "资源管理") @RequestMapping("/api/sarResource/ts-resource") public class TsResourceController extends BaseController { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DetAllStandDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DetAllStandDto.java index a1e195cf..e0da9d35 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DetAllStandDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DetAllStandDto.java @@ -8,6 +8,6 @@ public class DetAllStandDto { Integer size; String cid; String userId; - String startTime; + String endTime; String Account; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java index d2bc72eb..54e7ba1c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java @@ -49,6 +49,15 @@ public class SarPublicIdeaAll extends BaseEntity { @TableField("dept_name") private String deptName; + @TableField("reason") + private String reason; + + @TableField("old_text") + private String oldText; + + @TableField("new_text") + private String newText; + public static final String CID = "cid"; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java index 6d17d6f7..7f34cc6c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java @@ -40,11 +40,11 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl selectAll(DetAllStandDto detAllStandDto) { - if (detAllStandDto.getStartTime() != null) { + if (detAllStandDto.getEndTime() != null) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); Date Time = null; try { - Time = sdf.parse(detAllStandDto.getStartTime()); + Time = sdf.parse(detAllStandDto.getEndTime()); } catch (ParseException e) { e.printStackTrace(); } @@ -110,7 +110,7 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl page = iSarInterpretationNationalStandardService.page(iPage, queryWrapper); while (page.getRecords().remove(null)) ; @@ -103,17 +101,15 @@ public class SarStandardComplianceAssessResultController { if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { 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; } @@ -145,7 +141,7 @@ public class SarStandardComplianceAssessResultController { } iSarInterpretationNationalStandardService.saveOrUpdateBatch(entityList); - } else { + }else{ List entityList = new ArrayList<>(); for (int i = 0; i < insertEntity.entityList.size(); i++) { SarInterpretationForeignStandard obj = new SarInterpretationForeignStandard(); @@ -166,10 +162,10 @@ 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.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()); +// if (eo.getStandId() != null) queryWrapper.like("STAND_ID", eo.getStandId()); +// if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime()); + IPage page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper); return Result.success(page); } 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 4601161e..c6496762 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,6 +91,10 @@ public class SarStandardComplianceProductAssess extends BaseEntity { @ApiModelProperty(value = "在产产品合规信息") private String productionCompliance; + @ApiModelProperty(value = "在产产品不合规信息") + @TableField("production_non_compliance") + private String productionNonCompliance; + @ApiModelProperty(value = "在产产品不合规应对措施") private String productionCountermeasures; @@ -113,6 +117,10 @@ public class SarStandardComplianceProductAssess extends BaseEntity { @TableField("clause_name") private String clauseName; + @ApiModelProperty(value = "流程UUID") + @TableField("type") + private String type; + private String id;