From a7892dcb872ca7c11044924227a571ad2541e98d Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 28 Dec 2020 14:30:34 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=9C=BA=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?= =?UTF-8?q?=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/lz/config/ShiroConfig.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/lz/config/ShiroConfig.java b/src/main/java/com/lz/config/ShiroConfig.java index 292daac3..2fa50847 100644 --- a/src/main/java/com/lz/config/ShiroConfig.java +++ b/src/main/java/com/lz/config/ShiroConfig.java @@ -63,6 +63,8 @@ public class ShiroConfig { filterMap.put("/swagger-resources/**", "anon"); filterMap.put("/captcha.jpg", "anon"); filterMap.put("/aaa.txt", "anon"); + filterMap.put("/oneCode/update/prints", "anon"); + filterMap.put("/oneCode/no/prints", "anon"); filterMap.put("/dtlg/login", "anon"); filterMap.put("/dtlg/luck", "anon"); filterMap.put("/dtlg/look", "anon"); From 8f40b828a7d40d1ace9147714dbebb9d96ead7bd Mon Sep 17 00:00:00 2001 From: DirectionOfMind <3182967682@qq.com> Date: Mon, 28 Dec 2020 15:08:33 +0800 Subject: [PATCH 02/16] count --- src/main/java/com/lz/modules/equipment/dao/TCountMapper.java | 2 ++ .../equipment/service/impl/EquipmentInfoServiceImpl.java | 5 ++++- src/main/resources/mapper/equipment/TCountMapper.xml | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/equipment/dao/TCountMapper.java b/src/main/java/com/lz/modules/equipment/dao/TCountMapper.java index 7e35a0e3..557ae602 100644 --- a/src/main/java/com/lz/modules/equipment/dao/TCountMapper.java +++ b/src/main/java/com/lz/modules/equipment/dao/TCountMapper.java @@ -40,4 +40,6 @@ public interface TCountMapper extends BaseMapper { List selectListLimit(@Param("limit") int limit); List selectByReq(@Param("page") IPage page, @Param("req") TCountReq req); + + int selectMaxNum(); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java b/src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java index e6094e20..4316ee94 100644 --- a/src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java +++ b/src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java @@ -118,7 +118,9 @@ public class EquipmentInfoServiceImpl extends ServiceImpl + From 108f1b939760b5ae259c65480898e75e22418f38 Mon Sep 17 00:00:00 2001 From: DirectionOfMind <3182967682@qq.com> Date: Mon, 28 Dec 2020 15:25:00 +0800 Subject: [PATCH 03/16] fix --- .../modules/equipment/controller/EquipmentController.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/com/lz/modules/equipment/controller/EquipmentController.java b/src/main/java/com/lz/modules/equipment/controller/EquipmentController.java index 7b6cfc60..182d29b1 100644 --- a/src/main/java/com/lz/modules/equipment/controller/EquipmentController.java +++ b/src/main/java/com/lz/modules/equipment/controller/EquipmentController.java @@ -6,6 +6,7 @@ import com.lz.common.utils.StringUtil; import com.lz.modules.app.annotation.Login; import com.lz.modules.app.entity.StaffEntity; import com.lz.modules.app.service.StaffService; +import com.lz.modules.equipment.dao.TCountMapper; import com.lz.modules.equipment.entity.*; import com.lz.modules.equipment.entity.model.*; import com.lz.modules.equipment.service.*; @@ -55,6 +56,8 @@ public class EquipmentController extends AbstractController { private EquipmentQrService equipmentQrService; @Autowired private SpecialApplyInfoService specialApplyInfoService; + @Autowired + private TCountMapper tCountMapper; @GetMapping("findEquipmentById") @RequiresPermissions("user:device:pandian") @@ -85,6 +88,11 @@ public class EquipmentController extends AbstractController { model.setSpecId(equipmentSpecs1.getId()); } });*/ + int i = tCountMapper.selectMaxNum(); + if(equipmentInfo.getCount() Date: Mon, 28 Dec 2020 15:26:30 +0800 Subject: [PATCH 04/16] fix --- .../com/lz/modules/equipment/controller/EquipmentController.java | 1 + .../modules/equipment/service/impl/EquipmentInfoServiceImpl.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/java/com/lz/modules/equipment/controller/EquipmentController.java b/src/main/java/com/lz/modules/equipment/controller/EquipmentController.java index 182d29b1..359403e7 100644 --- a/src/main/java/com/lz/modules/equipment/controller/EquipmentController.java +++ b/src/main/java/com/lz/modules/equipment/controller/EquipmentController.java @@ -90,6 +90,7 @@ public class EquipmentController extends AbstractController { });*/ int i = tCountMapper.selectMaxNum(); if(equipmentInfo.getCount() Date: Mon, 28 Dec 2020 15:28:38 +0800 Subject: [PATCH 05/16] fix --- .../lz/modules/equipment/controller/EquipmentController.java | 1 + .../equipment/service/impl/EquipmentInfoServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/equipment/controller/EquipmentController.java b/src/main/java/com/lz/modules/equipment/controller/EquipmentController.java index 359403e7..04743c56 100644 --- a/src/main/java/com/lz/modules/equipment/controller/EquipmentController.java +++ b/src/main/java/com/lz/modules/equipment/controller/EquipmentController.java @@ -95,6 +95,7 @@ public class EquipmentController extends AbstractController { iEquipmentInfoService.insertEquipmentInfo(equipmentInfo); } addRecord(equipmentInfo); + model.setId(equipmentInfo.getId()); return R.ok().put("data", model); } diff --git a/src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java b/src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java index 5bca650c..ea98e99d 100644 --- a/src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java +++ b/src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java @@ -121,7 +121,7 @@ public class EquipmentInfoServiceImpl extends ServiceImpl Date: Mon, 28 Dec 2020 15:33:37 +0800 Subject: [PATCH 06/16] fix --- src/main/resources/mapper/equipment/EquipmentInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml b/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml index c8b8699c..77e392a2 100644 --- a/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml +++ b/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml @@ -30,7 +30,7 @@ - + From 930c78ebf7c3bb121f26743649fd427e9163ccb6 Mon Sep 17 00:00:00 2001 From: DirectionOfMind <3182967682@qq.com> Date: Mon, 28 Dec 2020 15:39:28 +0800 Subject: [PATCH 07/16] fix --- src/main/resources/mapper/equipment/EquipmentInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml b/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml index 77e392a2..5bfe1df0 100644 --- a/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml +++ b/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml @@ -133,7 +133,7 @@ sai_id = #{saiId}, type_id=#{typeId}, brand_id=#{brandId}, - specs_id=#{specsId]}, + specs_id=#{specsId}, count = #{count} ,gmt_modified = now() From 35da0f9f4a566e409b77ed9e039c920234124859 Mon Sep 17 00:00:00 2001 From: DirectionOfMind <3182967682@qq.com> Date: Mon, 28 Dec 2020 15:40:24 +0800 Subject: [PATCH 08/16] fix --- src/main/resources/mapper/equipment/EquipmentInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml b/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml index 5bfe1df0..9ffe58af 100644 --- a/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml +++ b/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml @@ -97,7 +97,7 @@ #{ saiId}, #{typeId}, #{brandId}, - #{specsId]}, + #{specsId}, #{ count}, 0, now(), From 74319a42bb4ffcfd5876d859e64a9536ec818b4d Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 29 Dec 2020 10:30:53 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E6=97=B6specsId=E5=BE=97=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipment/service/impl/EquipmentInfoServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java b/src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java index ea98e99d..68f09934 100644 --- a/src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java +++ b/src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java @@ -123,11 +123,12 @@ public class EquipmentInfoServiceImpl extends ServiceImpl Date: Tue, 29 Dec 2020 10:33:52 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E7=BC=96=E8=BE=91=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=BE=97=E6=97=B6=E5=80=99=E5=90=8C=E6=AD=A5=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=9B=B8=E5=85=B3id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipment/service/impl/EquipmentInfoServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java b/src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java index 68f09934..bd64e8c4 100644 --- a/src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java +++ b/src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java @@ -173,6 +173,9 @@ public class EquipmentInfoServiceImpl extends ServiceImpl Date: Tue, 29 Dec 2020 10:38:34 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E8=B5=84=E4=BA=A7=E6=97=B6=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=9B=B4=E6=96=B0specsId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lz/modules/equipment/entity/EquipmentInfoReq.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/lz/modules/equipment/entity/EquipmentInfoReq.java b/src/main/java/com/lz/modules/equipment/entity/EquipmentInfoReq.java index 94d29863..aca49bb7 100644 --- a/src/main/java/com/lz/modules/equipment/entity/EquipmentInfoReq.java +++ b/src/main/java/com/lz/modules/equipment/entity/EquipmentInfoReq.java @@ -68,6 +68,9 @@ public class EquipmentInfoReq implements java.io.Serializable { private Long brandId; + //规格id + private Long specsId; + private String gmtInStartTime; private String gmtInEndTime; From 99fac76989d6012ee94ae25fe277b1a84d65cbce Mon Sep 17 00:00:00 2001 From: DirectionOfMind <3182967682@qq.com> Date: Tue, 29 Dec 2020 16:05:05 +0800 Subject: [PATCH 12/16] fix --- src/main/resources/mapper/app/ResultRecordMapper.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml index 6fa99f89..afb0e479 100644 --- a/src/main/resources/mapper/app/ResultRecordMapper.xml +++ b/src/main/resources/mapper/app/ResultRecordMapper.xml @@ -508,9 +508,6 @@ ) - - and r.flow_process = #{req.flowProcess} - and r.staff_name LIKE CONCAT('%',#{req.staffName},'%') From b18e6d24dd2d87589c800e83064a0e6f8a553c5c Mon Sep 17 00:00:00 2001 From: DirectionOfMind <3182967682@qq.com> Date: Tue, 29 Dec 2020 16:10:01 +0800 Subject: [PATCH 13/16] fix --- src/main/resources/mapper/app/ResultRecordMapper.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml index afb0e479..fc56b8a5 100644 --- a/src/main/resources/mapper/app/ResultRecordMapper.xml +++ b/src/main/resources/mapper/app/ResultRecordMapper.xml @@ -542,9 +542,6 @@ ) - - and r.flow_process = #{req.flowProcess} - and r.staff_name LIKE CONCAT('%',#{req.staffName},'%') From f4d348da68409b354689522d7a8a6f7c9cd7fe92 Mon Sep 17 00:00:00 2001 From: DirectionOfMind <3182967682@qq.com> Date: Wed, 30 Dec 2020 11:05:53 +0800 Subject: [PATCH 14/16] fix --- .../lz/modules/equipment/controller/EquipmentController.java | 2 +- src/main/resources/mapper/equipment/EquipmentInfoMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/lz/modules/equipment/controller/EquipmentController.java b/src/main/java/com/lz/modules/equipment/controller/EquipmentController.java index 04743c56..0ca05229 100644 --- a/src/main/java/com/lz/modules/equipment/controller/EquipmentController.java +++ b/src/main/java/com/lz/modules/equipment/controller/EquipmentController.java @@ -90,7 +90,7 @@ public class EquipmentController extends AbstractController { });*/ int i = tCountMapper.selectMaxNum(); if(equipmentInfo.getCount() - select * from equipment_info where code=#{code} and is_delete = 0 limit 1 + select * from equipment_info where code=#{code} and is_delete = 0 order by count desc limit 1