From 2cc9c41b4947115b430696a86df7b3b6846463cc Mon Sep 17 00:00:00 2001 From: dearlin <1261008090@qq.com> Date: Tue, 14 Nov 2023 10:57:54 +0800 Subject: [PATCH 1/7] =?UTF-8?q?fix:=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E4=BC=81=E4=B8=9A=E7=AB=AF=E6=9D=A5=E6=BA=90?= =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../keyProjects/app/AppKeyprojectCheckController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java index aedca068..5457c3b9 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java @@ -64,7 +64,7 @@ public class AppKeyprojectCheckController extends BaseController { pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("ISDELETE", 0); //是否删除 - pd.put("SOURCE", 1); //企业ID + pd.put("SOURCE", 2); //企业2 keyprojectcheckService.save(pd); String currentTime = DateUtil.date2Str(new Date()); From 86b4493820d493f9a09902eeeef8d55ebf29c562 Mon Sep 17 00:00:00 2001 From: dearlin <1261008090@qq.com> Date: Tue, 14 Nov 2023 11:31:00 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix:ai=E6=8A=A5=E8=AD=A6=E4=B8=8D=E5=AD=98?= =?UTF-8?q?=E9=9A=90=E6=82=A3=E5=8F=91=E7=8E=B0=E4=BA=BA=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/keyProjects/app/AppAIWarningController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/zcloud/controller/keyProjects/app/AppAIWarningController.java b/src/main/java/com/zcloud/controller/keyProjects/app/AppAIWarningController.java index 312b47ee..d17877f0 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/app/AppAIWarningController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/app/AppAIWarningController.java @@ -118,6 +118,7 @@ public class AppAIWarningController extends BaseController { hidden.put("HIDDEN_ID",HIDDEN_ID); //主键 pd.put("HIDDEN_ID",hidden.getString("HIDDEN_ID")); hidden.put("FOREIGN_ID", pd.getString("OUTSOURCED_ID")); //外键ID + hidden.put("CORPINFO_ID", pd.getString("CORPINFO_ID")); //隐患发现人的公司 hidden.put("HIDDENDESCR", json.getString("HIDDENDESCR")); //隐患描述 hidden.put("HIDDENPART", json.getString("HIDDENPART")); //隐患部位 hidden.put("HIDDENLEVEL", json.getString("HIDDENLEVEL")); //隐患级别 From d1600cd7ce5c3e160942845fef358866cbe3204a Mon Sep 17 00:00:00 2001 From: dearlin <1261008090@qq.com> Date: Tue, 14 Nov 2023 14:07:41 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix:ai=E6=8A=A5=E8=AD=A6=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E7=AB=AF=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=9A=90=E6=82=A3=E9=AA=8C?= =?UTF-8?q?=E6=94=B6=E7=9A=84=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml index 06680df2..2a55495a 100644 --- a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml +++ b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml @@ -358,7 +358,7 @@ where f.ISDELETE = '0' - and bo.OUTSOURCED_ID = #{pd.OUTSOURCED_ID} + and (bo.OUTSOURCED_ID = #{pd.OUTSOURCED_ID} or f.FOREIGN_ID = #{pd.OUTSOURCED_ID}) and f.STATE = 1 From 4678fb2bc368bb7644288cda1fbcceb95e183bd5 Mon Sep 17 00:00:00 2001 From: dearlin <1261008090@qq.com> Date: Wed, 15 Nov 2023 16:25:34 +0800 Subject: [PATCH 4/7] =?UTF-8?q?fix:=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-local.properties | 5 +++-- src/main/resources/application.properties | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties index 5bb49ecc..13026235 100644 --- a/src/main/resources/application-local.properties +++ b/src/main/resources/application-local.properties @@ -61,8 +61,9 @@ spring.main.banner-mode=off # #qa-regulatory-gwj.api.url=http://192.168.0.79:8008 -preventionxgf.api.url=http://192.168.0.31:8992/qa-prevention-xgf/ -qa-regulatory-gwj.api.url=http://192.168.0.31:8992/qa-regulatory-gwj/ +preventionxgf.api.url=http://192.168.0.79:8088/ +qa-regulatory-gwj.api.url=http://192.168.0.79:8092/ + #????? smb.host=39.103.224.166 smb.port=22 diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 9f55743c..a93edfdf 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -2,11 +2,12 @@ spring.application.name=qa-prevention-gwj server.port=8091 #?? -spring.profiles.active=local +#spring.profiles.active=local #?? -#spring.profiles.active=dev +spring.profiles.active=dev #?? #spring.profiles.active=master + From 8e5325bd17f4fd5d62aaac90ed86370d0c14765d Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Thu, 16 Nov 2023 17:20:16 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=A4=84=E7=BD=9A?= =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E6=8E=A5=E5=8F=A3=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/AppKeyprojectCheckController.java | 29 ++++++++++++++++++- .../keyProjects/KeyprojectHiddenMapper.java | 9 ++++++ .../keyProjects/KeyprojectHiddenService.java | 9 ++++++ .../impl/KeyprojectHiddenServiceImpl.java | 10 +++++++ .../keyProjects/KeyprojectHiddenMapper.xml | 17 +++++++++++ 5 files changed, 73 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java index 5457c3b9..9b5ce3a1 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java @@ -85,8 +85,9 @@ public class AppKeyprojectCheckController extends BaseController { time = DateUtil.calculateDateSecond(time, 1); } } - + Boolean boo = false; // 增加开关控制 if (Tools.notEmpty(pd.getString("HIDDENJSON"))) { + boo = true; List hiddenList = new ArrayList(); List list = (List) JSON.parse(pd.getString("HIDDENJSON")); String time = currentTime; @@ -142,6 +143,32 @@ public class AppKeyprojectCheckController extends BaseController { records = SendSmsUtil.getRecords(person.getString("PHONENUM"),tpContent); jsonArray.add(records); SendSmsUtil.sendSms("121451",jsonArray,null); + //发送罚款待处理 上文开关控制这里发送不 + if(boo){ + List jsonList = (List) JSON.parse(pd.getString("HIDDENJSON")); + String PUNISHTHEPERSON = keyprojectHiddenService.getPUNISHTHEPERSON(pd); + if (!Tools.isEmpty(PUNISHTHEPERSON)) { + PageData selectPageData = new PageData(); + String[] split = PUNISHTHEPERSON.split(","); + selectPageData.put("ids", split); + List list = keyprojectHiddenService.getPhone(selectPageData); + for (JSONObject json : jsonList) { + for(String phone:list) { + JSONArray jsonBrray = new JSONArray(); + //接受返回结果 + JSONObject recordsB = new JSONObject(); + //定义替换参数 + JSONObject tpContentB = new JSONObject(); + tpContentB.put("HIDDENDESCR",json.getString("HIDDENDESCR")); //隐患描述 + if(StringUtils.isNotBlank(phone)){ + recordsB = SendSmsUtil.getRecords(phone,tpContentB); + jsonBrray.add(recordsB); + SendSmsUtil.sendSms("121487",jsonBrray,null); + } + } + } + } + } } }catch (Exception e){ e.printStackTrace(); diff --git a/src/main/java/com/zcloud/mapper/datasource/keyProjects/KeyprojectHiddenMapper.java b/src/main/java/com/zcloud/mapper/datasource/keyProjects/KeyprojectHiddenMapper.java index 9fa7b3bd..0fbcecc3 100644 --- a/src/main/java/com/zcloud/mapper/datasource/keyProjects/KeyprojectHiddenMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/keyProjects/KeyprojectHiddenMapper.java @@ -158,5 +158,14 @@ public interface KeyprojectHiddenMapper { */ List getpunishlistPage(Page page); + /** + * 获取当前隐患的处罚人 + * @param pd + * @return + */ + String getPUNISHTHEPERSON(PageData pd); + + + List getPhone(PageData pd); } diff --git a/src/main/java/com/zcloud/service/keyProjects/KeyprojectHiddenService.java b/src/main/java/com/zcloud/service/keyProjects/KeyprojectHiddenService.java index 954c4e8f..16db8958 100644 --- a/src/main/java/com/zcloud/service/keyProjects/KeyprojectHiddenService.java +++ b/src/main/java/com/zcloud/service/keyProjects/KeyprojectHiddenService.java @@ -180,5 +180,14 @@ public interface KeyprojectHiddenService { public PageData keyprojectcount(PageData pd)throws Exception; List getpunishlist(Page page); + + /** + * 获取当前隐患的处罚人 + * @param pd + * @return + */ + String getPUNISHTHEPERSON(PageData pd); + + List getPhone(PageData pd); } diff --git a/src/main/java/com/zcloud/service/keyProjects/impl/KeyprojectHiddenServiceImpl.java b/src/main/java/com/zcloud/service/keyProjects/impl/KeyprojectHiddenServiceImpl.java index 9a47f11f..99fc74dc 100644 --- a/src/main/java/com/zcloud/service/keyProjects/impl/KeyprojectHiddenServiceImpl.java +++ b/src/main/java/com/zcloud/service/keyProjects/impl/KeyprojectHiddenServiceImpl.java @@ -253,5 +253,15 @@ public class KeyprojectHiddenServiceImpl implements KeyprojectHiddenService { public List getpunishlist(Page page) { return hiddenMapper.getpunishlistPage(page); } + + @Override + public String getPUNISHTHEPERSON(PageData pd) { + return hiddenMapper.getPUNISHTHEPERSON(pd); + } + + @Override + public List getPhone(PageData pd) { + return hiddenMapper.getPhone(pd); + } } diff --git a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml index 2a55495a..5030e522 100644 --- a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml +++ b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml @@ -1606,4 +1606,21 @@ h.ISPUNISH ASC, p.HANDLED DESC + + + + From 6d238d6cc1b484898510907fcbd359c45a3f4245 Mon Sep 17 00:00:00 2001 From: dearlin <1261008090@qq.com> Date: Wed, 22 Nov 2023 16:56:33 +0800 Subject: [PATCH 6/7] =?UTF-8?q?fix:=20=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E5=A4=84=E7=BD=9A=E7=AE=A1=E7=90=86=20=E9=87=8C=E9=9D=A2?= =?UTF-8?q?=E7=9A=84=E9=9A=90=E6=82=A3=E6=B2=A1=E6=9C=89=E5=8C=BA=E5=88=86?= =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B=E9=A1=B9=E7=9B=AE=20?= =?UTF-8?q?=E6=AF=8F=E4=B8=AA=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B=E7=82=B9?= =?UTF-8?q?=E8=BF=9B=E5=8E=BB=E9=83=BD=E4=B8=80=E6=A0=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/keyProjects/KeyprojectPunishMapper.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml index 31345755..86f09deb 100644 --- a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml +++ b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml @@ -168,11 +168,12 @@ u.UNITS_NAME, p.NAME AS PERSON_NAME from - f + BUS_KEYPROJECTPUNISH f + LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck k ON f.KEYPROJECTCHECK_ID = k.KEYPROJECTCHECK_ID left join `qa-gwj-prevention`.vi_user_all cr on cr.USER_ID = f.CREATOR left join `qa-gwj-regulatory`.sys_user cre on cre.USER_ID = f.CREATOR left join `qa-gwj-regulatory`.BUS_UNITS u on u.UNITS_ID = f.UNITS_ID - left join `qa-gwj-regulatory`.BUS_OUTSOURCED o on o.UNITS_ID = u.UNITS_ID + left join `qa-gwj-regulatory`.BUS_OUTSOURCED o on o.OUTSOURCED_ID = k.OUTSOURCED_ID left join `qa-gwj-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.PERSONNELMANAGEMENT_ID where f.ISDELETE = '0' @@ -184,7 +185,7 @@ ) - and o.OUTSOURCED_ID = #{pd.OUTSOURCED_ID} + and k.OUTSOURCED_ID = #{pd.OUTSOURCED_ID} and f.HANDLED = 0 From c2b835ebfa0118aa30f902d971080b05ff268a3c Mon Sep 17 00:00:00 2001 From: dearlin <1261008090@qq.com> Date: Tue, 28 Nov 2023 16:57:13 +0800 Subject: [PATCH 7/7] =?UTF-8?q?add:=20=E5=AE=9A=E4=BD=8D=E5=8D=A1=E5=8F=B7?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/controller/system/UsersController.java | 15 +++++++++++++++ .../mapper/datasource/system/UsersMapper.java | 2 ++ .../com/zcloud/service/system/UsersService.java | 2 ++ .../service/system/impl/UsersServiceImpl.java | 5 +++++ .../mybatis/datasource/system/UsersMapper.xml | 9 +++++++++ 5 files changed, 33 insertions(+) diff --git a/src/main/java/com/zcloud/controller/system/UsersController.java b/src/main/java/com/zcloud/controller/system/UsersController.java index b7de469d..8beec699 100644 --- a/src/main/java/com/zcloud/controller/system/UsersController.java +++ b/src/main/java/com/zcloud/controller/system/UsersController.java @@ -517,6 +517,7 @@ public class UsersController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); + // if(pd.get("USERAVATARURL")!=null && !pd.getString("USERAVATARURL").equals("")){ // System.out.println("USERAVATARURL原长度："+pd.getString("USERAVATARURL").length()); // String USERAVATARURL64 = ImageAnd64Binary.zipBase64(pd.getString("USERAVATARURL")); @@ -562,6 +563,12 @@ public class UsersController extends BaseController { if ("true".equals(pd.getString("ISSTUDENT"))) { pd.put("IS_ONLINELEARNING", '1'); } + // todo + // 定位卡号 规则 如果俩个人使用同一一个卡号，最后一个人会是这个卡号。保证一个卡号一个人用。(11.28) + // 不同的公司，它定位卡的配置方案是不一样的，就你像九公司，九公司的卡是随机的。就他不是卡跟着人走，他就一天一变。 目前暂定这样 + if (Tools.notEmpty(pd.getString("CARDNO"))) { + usersService.resetCardNo(pd); + } usersService.editUser(pd); //执行修改 if ("true".equals(pd.getString("ISSTUDENT"))) { pd.put("IS_ONLINELEARNING", "1"); @@ -909,6 +916,14 @@ public class UsersController extends BaseController { if ("true".equals(pd.getString("ISSTUDENT"))) { pd.put("IS_ONLINELEARNING", '1'); } + // todo + // 定位卡号 规则 如果俩个人使用同一一个卡号，最后一个人会是这个卡号。保证一个卡号一个人用。(11.28) + // 不同的公司，它定位卡的配置方案是不一样的，就你像九公司，九公司的卡是随机的。就他不是卡跟着人走，他就一天一变。 目前暂定这样 + if (Tools.notEmpty(pd.getString("CARDNO"))) { + usersService.resetCardNo(pd); + }else { + pd.put("CARDNO",null); + } usersService.saveUser(pd); //执行保存 if ("true".equals(pd.getString("ISSTUDENT"))) { diff --git a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java index 6ee4ca91..63de3eb8 100644 --- a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java @@ -290,4 +290,6 @@ public interface UsersMapper { PageData findByCorpInfoId(PageData pd); List selectUserListByUserIds(PageData pd); + + void resetCardNo(PageData pd); } diff --git a/src/main/java/com/zcloud/service/system/UsersService.java b/src/main/java/com/zcloud/service/system/UsersService.java index 3d8efa78..74747c24 100644 --- a/src/main/java/com/zcloud/service/system/UsersService.java +++ b/src/main/java/com/zcloud/service/system/UsersService.java @@ -341,4 +341,6 @@ public interface UsersService { List selectUserListByUserIds(PageData selectPageData); + + void resetCardNo(PageData pd); } diff --git a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java index 6c69c16f..9bec3e26 100644 --- a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java @@ -429,4 +429,9 @@ public class UsersServiceImpl implements UsersService { public List selectUserListByUserIds(PageData pd) { return usersMapper.selectUserListByUserIds(pd); } + + @Override + public void resetCardNo(PageData pd) { + usersMapper.resetCardNo(pd); + } } diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml index b81ad005..52653c68 100644 --- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml @@ -90,6 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WORKPERIOD, JCR, CORPINFO_ID, + CARDNO, ISDELETE @@ -129,6 +130,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" f.WORKPERIOD, f.JCR, f.CORPINFO_ID, + f.CARDNO, f.ISDELETE @@ -165,6 +167,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{WORKPERIOD}, #{JCR}, #{CORPINFO_ID}, + #{CARDNO}, #{ISDELETE} @@ -381,6 +384,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" IS_HAZARDCONFIRMER = #{IS_HAZARDCONFIRMER}, IS_ONLINELEARNING = #{IS_ONLINELEARNING}, PHONE = #{PHONE} + + ,CARDNO = #{CARDNO} + ,DURATION = #{DURATION} @@ -1164,6 +1170,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where USER_ID = #{USER_ID} + + update sys_user set CARDNO = null where CARDNO = #{CARDNO} +