From 8db629a3f82ce1b9c1184c28bd0baa57a5962e22 Mon Sep 17 00:00:00 2001 From: zxy-lbj <15192043237@163.com> Date: Fri, 2 Jul 2021 02:27:45 +0000 Subject: [PATCH 01/16] Update application-dev.properties --- adc-da-main/src/main/resources/application-dev.properties | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 1b77a4b0..1d9acd09 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -13,7 +13,10 @@ spring.application.name=gsar application.code=20200101 application.center=1 #============================================== - +#Eruept +eureka.client.allow-redirects=true +eureka.client.register-with-eureka=true +eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/ #============================================== # 邮箱配置 #============================================== From b5fae61dc233caeadb3583dbdc9636c231e4364d Mon Sep 17 00:00:00 2001 From: zxy-lbj <15192043237@163.com> Date: Fri, 2 Jul 2021 02:28:34 +0000 Subject: [PATCH 02/16] Update application-dev.properties --- adc-da-main/src/main/resources/application-dev.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 1d9acd09..05ce6353 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -16,7 +16,7 @@ application.center=1 #Eruept eureka.client.allow-redirects=true eureka.client.register-with-eureka=true -eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/ +eureka.client.service-url.defaultZone=http://101.36.227.25:8050//eureka/ #============================================== # 邮箱配置 #============================================== From 0ed5e3d5954315194537fab03f45661ecf407aaf Mon Sep 17 00:00:00 2001 From: zxy-lbj <15192043237@163.com> Date: Fri, 2 Jul 2021 02:36:14 +0000 Subject: [PATCH 03/16] Update application-dev.properties --- adc-da-main/src/main/resources/application-dev.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 05ce6353..1d9acd09 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -16,7 +16,7 @@ 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:8050//eureka/ +eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/ #============================================== # 邮箱配置 #============================================== From 3dd392b411f820b2990323e1cf6d227b0e892e0f Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 9 Aug 2021 17:52:01 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=81=EF=BC=81=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/SarLawsAttrDetailedListDao.java | 2 +- .../sarStandIdea/entity/SarPublicIdea.java | 3 ++ .../controller/SarStandItemsController.java | 2 +- .../sarStandItems/entity/FindStandDto.java | 1 + .../entity/SarStandItemsDto.java | 4 +++ .../impl/SarStandItemsServiceImpl.java | 14 +++++----- ...rpretationNationalStandardServiceImpl.java | 28 +++++++++---------- .../SarStandItems/SarStandItemsMapper.xml | 2 +- .../SarLawsAttrDetailedListMapper.xml | 6 ++++ 9 files changed, 38 insertions(+), 24 deletions(-) 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 6dba1030..47444721 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 @@ -30,7 +30,7 @@ public interface SarLawsAttrDetailedListDao extends BaseMapper selectLawsByIdE(@Param("param1") List LawsIds); //根据标准id查出数据 - List selectLawsByIdC(@Param("param1") List LawsIds, @Param("standName") String standName,@Param("standType")String standType); + List selectLawsByIdC(@Param("start")Integer start,@Param("end")Integer end,@Param("param1") List LawsIds, @Param("standName") String standName,@Param("standType")String standType,@Param("fileType")String fileType); //查询时间 List selectTimes(String standId); List selectLawsId2(String standId); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdea.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdea.java index 0e8f9a0a..37c296ba 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdea.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdea.java @@ -60,5 +60,8 @@ public class SarPublicIdea extends BaseEntity { @TableField("stand_id") private String standId; + @TableField("stand_type") + private String standType; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java index 7a3136fc..dfb79043 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java @@ -70,7 +70,7 @@ public class SarStandItemsController extends BaseController { } - @ApiOperation(value = "标准查询") + @ApiOperation(value = "标准批量保存") @PostMapping("/saveBatch") public String saveBatch(@RequestBody List findStandDto){ findStandDto.forEach(sarStandItems -> sarStandItems.setId(UUIDUtils.randomUUID(32))); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindStandDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindStandDto.java index 48409480..09d43f4b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindStandDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindStandDto.java @@ -14,4 +14,5 @@ public class FindStandDto { private int size; private String standName; private String standType; + private String fileType; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java index e6292810..c1268581 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java @@ -44,4 +44,8 @@ public class SarStandItemsDto { @ApiModelProperty(value = "覆盖关系") private String busStandCover; + private String xcxssrq; + + private String zccssrq; + } 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 65be9704..3c58b975 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 @@ -85,8 +85,8 @@ public class SarStandItemsServiceImpl extends ServiceImpl page1=new Page<>(); page1.setRecords(list); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java index 7156a35f..b65b6539 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java @@ -24,8 +24,8 @@ import java.util.List; @Service public class SarInterpretationNationalStandardServiceImpl extends ServiceImpl implements ISarInterpretationNationalStandardService { - @Autowired - SarStandardComplianceProductAssessDao sarStandardComplianceProductAssessDao; +// @Autowired +// SarStandardComplianceProductAssessDao sarStandardComplianceProductAssessDao; @Override public String saveBath(List sarInterpretationNationalStandards) { @@ -34,18 +34,18 @@ public class SarInterpretationNationalStandardServiceImpl extends ServiceImpl { QueryWrapper queryWrapper=new QueryWrapper<>(); queryWrapper.eq("stand_id",sarInterpretationNationalStandard.getStandId()); - List assessList = sarStandardComplianceProductAssessDao.selectList(queryWrapper); - if (assessList.isEmpty()){ - SarStandardComplianceProductAssess sar=new SarStandardComplianceProductAssess(); - sar.setId(UUIDUtils.randomUUID(32)); - sar.setStandId(sarInterpretationNationalStandard.getStandId()); - sar.setStandNumber(sarInterpretationNationalStandard.getStandNumber()); - sar.setStandType(sarInterpretationNationalStandard.getStandType()); - sar.setStandName(sarInterpretationNationalStandard.getStandName()); - sar.setStandType(sarInterpretationNationalStandard.getStandType()); - sar.setInterpretationTime(sarInterpretationNationalStandard.getInterpretationTime()); - sarStandardComplianceProductAssessDao.insert(sar); - } +// List assessList = sarStandardComplianceProductAssessDao.selectList(queryWrapper); +// if (assessList.isEmpty()){ +// SarStandardComplianceProductAssess sar=new SarStandardComplianceProductAssess(); +// sar.setId(UUIDUtils.randomUUID(32)); +// sar.setStandId(sarInterpretationNationalStandard.getStandId()); +// sar.setStandNumber(sarInterpretationNationalStandard.getStandNumber()); +// sar.setStandType(sarInterpretationNationalStandard.getStandType()); +// sar.setStandName(sarInterpretationNationalStandard.getStandName()); +// sar.setStandType(sarInterpretationNationalStandard.getStandType()); +// sar.setInterpretationTime(sarInterpretationNationalStandard.getInterpretationTime()); +// sarStandardComplianceProductAssessDao.insert(sar); +// } }); String res = flag ? "1":"0"; return res; diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index eb3ce0d5..0de0d471 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -643,7 +643,7 @@ - select - ID,STAND_ID,ITEMS_NUM,ITEMS_NAME,RESPONSIBLE_UNIT,SVPPS,APPLY_ARCTIC,CLAIM_TYPE,BUS_STAND_COVER,DUTY_ENGINEER as - responsibleEngineer select ID,STAND_ID,ITEMS_NUM,ITEMS_NAME,RESPONSIBLE_UNIT,SVPPS,APPLY_ARCTIC,CLAIM_TYPE,BUS_STAND_COVER,DUTY_ENGINEER as responsibleEngineer,XCXSSRQ as xcxssrq,ZCCSSRQ as zccssrq from SAR_STAND_ITEMS where FILE_TYPE=#{type} From e52f316a59a72b989d3bd0d93b523275ffd420a6 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 10 Aug 2021 14:49:44 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=80=BB=E6=95=B0?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=20=EF=BC=81=EF=BC=81=EF=BC=81=EF=BC=81?= =?UTF-8?q?=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/SarLawsAttrDetailedListDao.java | 1 + .../impl/SarStandItemsServiceImpl.java | 2 +- .../SarLawsAttrDetailedListMapper.xml | 30 +++++++++++++++++-- 3 files changed, 30 insertions(+), 3 deletions(-) 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 47444721..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 @@ -31,6 +31,7 @@ public interface SarLawsAttrDetailedListDao extends BaseMapper selectLawsByIdE(@Param("param1") List LawsIds); //根据标准id查出数据 List selectLawsByIdC(@Param("start")Integer start,@Param("end")Integer end,@Param("param1") List LawsIds, @Param("standName") String standName,@Param("standType")String standType,@Param("fileType")String fileType); + List selectLawsByIdCount(@Param("param1") List LawsIds, @Param("standName") String standName,@Param("standType")String standType,@Param("fileType")String fileType); //查询时间 List selectTimes(String standId); List selectLawsId2(String standId); 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 a4addb97..dce6e79b 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 @@ -172,7 +172,7 @@ public class SarStandItemsServiceImpl extends ServiceImpl page1=new Page<>(); page1.setRecords(list); - page1.setTotal(dao.selectToken()); + page1.setTotal(sarLawsAttrDetailedListDao.selectLawsByIdCount(standId,findStandDto.getStandName(),findStandDto.getStandType(),findStandDto.getFileType()).size()); return page1; } 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 994ffcb3..70378358 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 @@ -110,6 +110,34 @@ group by a.ID limit #{start},#{end} + + + - select from From 8c92abab314c92f7dc9ab2344120587ea8320e9c Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 9 Aug 2021 17:52:01 +0800 Subject: [PATCH 15/16] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=81=EF=BC=81=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/SarLawsAttrDetailedListDao.java | 1 - .../SarLawsAttrDetailedListMapper.xml | 30 ++----------------- 2 files changed, 2 insertions(+), 29 deletions(-) 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..47444721 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 @@ -31,7 +31,6 @@ public interface SarLawsAttrDetailedListDao extends BaseMapper selectLawsByIdE(@Param("param1") List LawsIds); //根据标准id查出数据 List selectLawsByIdC(@Param("start")Integer start,@Param("end")Integer end,@Param("param1") List LawsIds, @Param("standName") String standName,@Param("standType")String standType,@Param("fileType")String fileType); - List selectLawsByIdCount(@Param("param1") List LawsIds, @Param("standName") String standName,@Param("standType")String standType,@Param("fileType")String fileType); //查询时间 List selectTimes(String standId); List selectLawsId2(String standId); 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 70378358..994ffcb3 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 @@ -110,34 +110,6 @@ group by a.ID limit #{start},#{end} - - - + + +