From 75cabd3e20d87e6c28f1aee0ed5020fc4d31b800 Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Mon, 6 May 2024 13:35:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E4=B8=8B=E5=8F=91?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../com/zhgd/xmgl/call/HikvisionCall.java | 5 +++++ .../car/controller/CarInfoController.java | 4 +++- .../zhgd/xmgl/modules/car/entity/CarInfo.java | 5 +++++ .../lib/wflow-server-1.0-SNAPSHOT.jar | Bin 481784 -> 482234 bytes 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 683fb109a..159f3d635 100644 --- a/pom.xml +++ b/pom.xml @@ -816,7 +816,7 @@ org.example - wflow-server1 + wflow-server 1.0-SNAPSHOT system ${basedir}/src/main/resources/lib/wflow-server-1.0-SNAPSHOT.jar diff --git a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java index 6e8618dda..23c5c4cf0 100644 --- a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java +++ b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java @@ -900,6 +900,11 @@ public class HikvisionCall { if (SecurityUtils.getUser() != null && SecurityUtils.getUser().getUserId() != null) { noticeService.addUserNotice(SecurityUtils.getUser().getUserId(), msg, title, "24"); } + if (carInfo.getUserIds() != null && carInfo.getUserIds().size() > 0) { + for (String userId : carInfo.getUserIds()) { + noticeService.addUserNotice(Long.valueOf(userId), msg, title, "24"); + } + } } private void sendNoticeForOrg(String title, String rs, String orgName) { diff --git a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java index 8fac2b51c..f3456dcea 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java @@ -9,6 +9,7 @@ import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.car.entity.CarInfo; import com.zhgd.xmgl.modules.car.service.ICarInfoService; +import com.zhgd.xmgl.security.util.SecurityUtils; import com.zhgd.xmgl.util.MessageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -89,7 +90,7 @@ public class CarInfoController { List carType = (List) map.get("carType"); List driverWorkerId = (List) map.get("driverWorkerId"); Integer carModuleType = MapUtils.getString(map, "carModuleType").equals("临时车辆") ? 2 : 3; - + List userIds = (List) map.get("userIds"); CarInfo carInfo = new CarInfo(); if(driverWorkerId != null) { carInfo.setDriverWorkerId(driverWorkerId.get(0).toString()); @@ -174,6 +175,7 @@ public class CarInfoController { carInfo.setOtherProve(JSON.toJSONString(otherProveList)); carInfo.setProjectSn(map.get("projectSn").toString()); carInfo.setIsBlack(MapUtils.getInteger(map, "isBlack")); + carInfo.setUserIds(userIds); carInfoService.addCarInfo(carInfo); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/car/entity/CarInfo.java b/src/main/java/com/zhgd/xmgl/modules/car/entity/CarInfo.java index 16a9420f3..323cad29c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/entity/CarInfo.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/entity/CarInfo.java @@ -14,6 +14,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.util.Date; +import java.util.List; /** * @Description: 车辆黑白名单管理 @@ -131,4 +132,8 @@ public class CarInfo implements Serializable { @ApiModelProperty(value = "企业名称") private String enterpriseName; + @TableField(exist = false) + @ApiModelProperty(value = "流程参与人") + private List userIds; + } diff --git a/src/main/resources/lib/wflow-server-1.0-SNAPSHOT.jar b/src/main/resources/lib/wflow-server-1.0-SNAPSHOT.jar index 4a161612ddbf4d8e154f1f41677632686405ab63..7f02efcc94658fb6df26e65f99bae8761e188d7d 100644 GIT binary patch delta 21551 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 delta 21264 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 Date: Mon, 6 May 2024 15:10:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9D=90=E6=96=99=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../car/controller/CarInfoController.java | 21 ++++++++++++------- .../xz/controller/XzMaterialController.java | 19 ++++++++++++++--- .../xmgl/modules/xz/entity/XzMaterial.java | 6 ++++++ 3 files changed, 36 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java index f3456dcea..51176b859 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java @@ -4,11 +4,15 @@ import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.mybatis.EntityMap; +import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; +import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService; import com.zhgd.xmgl.modules.car.entity.CarInfo; import com.zhgd.xmgl.modules.car.service.ICarInfoService; +import com.zhgd.xmgl.modules.worker.service.IWorkerInfoService; import com.zhgd.xmgl.security.util.SecurityUtils; import com.zhgd.xmgl.util.MessageUtil; import io.swagger.annotations.Api; @@ -45,6 +49,12 @@ public class CarInfoController { @Autowired private ICarInfoService carInfoService; + @Autowired + private ISystemUserService systemUserService; + + @Autowired + private IWorkerInfoService workerInfoService; + /** * 分页列表查询 * @return @@ -85,7 +95,7 @@ public class CarInfoController { @PostMapping(value = "/save") public Result save(@RequestBody Map map) { Object alarmPushWorkerId = map.get("alarmPushWorkerId"); - Object enterpriseId = map.get("enterpriseId"); + String userId = map.get("enterpriseId").toString(); Object driverWorkerName = map.get("driverWorkerName"); List carType = (List) map.get("carType"); List driverWorkerId = (List) map.get("driverWorkerId"); @@ -102,12 +112,9 @@ public class CarInfoController { List alarmPushWorkerIds = (List) alarmPushWorkerId; carInfo.setAlarmPushWorkerId(alarmPushWorkerIds.get(0).toString()); } - if (enterpriseId != null) { - List enterpriseIds = (List) enterpriseId; - String string = enterpriseIds.get(0).toString(); - if (StringUtils.isNotBlank(string)) { - carInfo.setEnterpriseId(Long.valueOf(string)); - } + if (userId != null) { + Long workerId = systemUserService.getOne(Wrappers.lambdaQuery().eq(SystemUser::getUserId, userId)).getWorkerId(); + carInfo.setEnterpriseId(workerInfoService.getById(workerId).getEnterpriseId()); } carInfo.setCarModuleType(carModuleType); Integer entryAndExitPermit = MapUtils.getString(map, "entryAndExitPermit").equals("单次") ? 0 : 1; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java index cc238a5ad..fb33e79c9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java @@ -6,10 +6,13 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.zhgd.annotation.OperLog; +import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; +import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService; import com.zhgd.xmgl.modules.project.entity.ProjectEnterprise; import com.zhgd.xmgl.modules.project.service.IProjectEnterpriseService; import com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo; import com.zhgd.xmgl.modules.worker.service.IEnterpriseInfoService; +import com.zhgd.xmgl.modules.worker.service.IWorkerInfoService; import com.zhgd.xmgl.modules.xz.entity.XzMaterialDetail; import com.zhgd.xmgl.util.PageUtil; import io.swagger.annotations.Api; @@ -67,6 +70,12 @@ public class XzMaterialController { @Autowired private IXzMaterialService xzMaterialService; + @Autowired + private ISystemUserService systemUserService; + + @Autowired + private IWorkerInfoService workerInfoService; + @Autowired private IEnterpriseInfoService enterpriseInfoService; @@ -164,11 +173,14 @@ public class XzMaterialController { @PostMapping(value = "/save") public Result save(@RequestBody JSONObject obj) { log.info("添加材料信息" + JSON.toJSONString(obj)); - List enterpriseIds = (List) obj.get("enterpriseId"); + String userId = obj.get("enterpriseId").toString(); + Integer type = Integer.parseInt(obj.get("type").toString()); XzMaterial xzMaterial = new XzMaterial(); + xzMaterial.setType(type); String [] param = {"name", "model", "specifications", "unit", "num", "remark"}; List list = new ArrayList<>(); XzMaterial exist = xzMaterialService.getOne(Wrappers.lambdaQuery() + .eq(XzMaterial::getType, type) .like(XzMaterial::getName, DateUtil.today()) .orderByDesc(XzMaterial::getCreateTime).last("limit 1")); if (exist == null) { @@ -200,8 +212,9 @@ public class XzMaterialController { } } xzMaterial.setProjectSn(obj.getString("projectSn")); - if (enterpriseIds != null && enterpriseIds.size() > 0) { - xzMaterial.setEnterpriseId(enterpriseIds.get(0)); + if (userId != null ) { + Long workerId = systemUserService.getOne(Wrappers.lambdaQuery().eq(SystemUser::getUserId, userId)).getWorkerId(); + xzMaterial.setEnterpriseId(workerInfoService.getById(workerId).getEnterpriseId().toString()); } xzMaterial.setXzMaterialList(list); xzMaterial.setCreateTime(new Date()); diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzMaterial.java b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzMaterial.java index d5a820c34..b04c6218b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzMaterial.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzMaterial.java @@ -45,6 +45,12 @@ public class XzMaterial implements Serializable { @Excel(name = "批次数量", width = 15) @ApiModelProperty(value = "批次数量") private Integer num; + /** + * 进出场标识(1:入场;2:出厂;) + */ + @Excel(name = "进出场标识(1:入场;2:出厂;)", width = 15) + @ApiModelProperty(value = "进出场标识(1:入场;2:出厂;)") + private Integer type; /** * 入场时间 */