UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

诊断第三方产品信息定时选入时，自动添加到耗材字典

Browse Source
dev2.0
anthonywj 2 years ago
parent c62383ff51
commit 5b15f6ff45
4 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File

26
src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java
Unescape Escape View File

@ -6,11 +6,14 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.dao.basic.UdiRelevanceDao;
import com.glxp.api.dao.thrsys.ThrProductsDao;
import com.glxp.api.entity.basic.UdiRelevanceEntity;
import com.glxp.api.entity.thrsys.ThrProductsEntity;
import com.glxp.api.entity.thrsys.ThrSystemDetailEntity;
import com.glxp.api.http.ErpBasicClient;
@ -19,7 +22,10 @@ import com.glxp.api.req.thrsys.PostThrProductsRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.basic.UdiRelevanceResponse;
import com.glxp.api.res.thrsys.ThrProductsResponse;
import com.glxp.api.service.basic.UdiContrastService;
import com.glxp.api.service.system.SystemParamConfigService;
import com.glxp.api.service.thrsys.ThrProductsService;
import com.glxp.api.util.IntUtil;
import com.glxp.api.util.RedisUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.session.ExecutorType;
@ -53,6 +59,8 @@ public class ThrProductsServiceImpl extends ServiceImpl<ThrProductsDao, ThrProdu
private ErpBasicClient erpBasicClient;
@Resource
private SqlSessionFactory sqlSessionFactory;
@Resource
SystemParamConfigService systemParamConfigService;
@Override
public ThrProductsEntity selectByCode(String code) {
@ -169,6 +177,12 @@ public class ThrProductsServiceImpl extends ServiceImpl<ThrProductsDao, ThrProdu
return ResultVOUtils.success("第三方系统产品数据已插入到数据库");
}
@Resource
UdiContrastService udiContrastService;
@Resource
UdiRelevanceDao udiRelevanceDao;
@Override
public BaseResponse downloadThrPi(ThrSystemDetailEntity thrSystemDetailEntity) {
int page = 1;
@ -194,6 +208,18 @@ public class ThrProductsServiceImpl extends ServiceImpl<ThrProductsDao, ThrProdu
thrProductsEntity.setId(IdUtil.getSnowflakeNextId());
thrProductsEntity.setThirdSysFk(thrSystemDetailEntity.getThirdSysFk());
thrProductsDao.insertThrProducts(thrProductsEntity);
if (StrUtil.isNotEmpty(thrSystemDetailEntity.getThirdSysFk()) && thrSystemDetailEntity.getThirdSysFk().equals("thirdId")) {
String value = systemParamConfigService.selectValueByParamKey("update_third_in_rel");
if (IntUtil.value(value) == 1) {
boolean isExit = udiRelevanceDao.exists(new QueryWrapper<UdiRelevanceEntity>().eq("mainId", thrProductsEntity.getCode()));
if (!isExit) {
udiContrastService.createOnlyMainId(thrProductsEntity.getCode());
}
}
}
} else {
boolean isChange = verifyDataChange(thrProductsEntity, item);
if (isChange) {

6
src/main/java/com/glxp/api/util/IntUtil.java
Unescape Escape View File

@ -25,13 +25,11 @@ public class IntUtil {
else return value;
}
public static int value(String value) {
if (StrUtil.isEmpty(value))
return 0;
else
return Integer.parseInt(value);
}
else return Integer.parseInt(value);
}
}

2
src/main/resources/application-dev.yml
Unescape Escape View File

@ -4,7 +4,7 @@ server:
spring:
datasource:
driver-class-name: com.p6spy.engine.spy.P6SpyDriver
jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pzh?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
username: root
password: 123456
hikari:

11
src/main/resources/schemas/schema_v2.2.sql
Unescape Escape View File

@ -8,8 +8,8 @@ CREATE TABLE IF NOT EXISTS `device_inspect_task`
`deptCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '部门',
`invCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '仓库',
`code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '资产编码',
`status` int NULL DEFAULT NULL COMMENT '状态',
`type` int NULL DEFAULT NULL COMMENT '类型',
`status` int NULL DEFAULT NULL COMMENT '状态',
`type` int NULL DEFAULT NULL COMMENT '类型',
`inspectUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检人',
`remindTime` datetime(0) NULL DEFAULT NULL COMMENT '提醒时间',
`remark` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检备注',
@ -34,7 +34,7 @@ CREATE TABLE IF NOT EXISTS `device_inspect_task_detail`
`id` int NOT NULL AUTO_INCREMENT,
`projectCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检项目编码',
`projectContent` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检内容',
`status` int NULL DEFAULT NULL COMMENT '状态（1：未开始；2：已检查；3：异常；4：不巡检',
`status` int NULL DEFAULT NULL COMMENT '状态（1：未开始；2：已检查；3：异常；4：不巡检',
`result` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检结果备注',
`inspectImage` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检图片',
`inspectUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检人',
@ -265,3 +265,8 @@ CALL Pro_Temp_ColumnWork('dept_device_detail', 'nameCode', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('device_inspect_plan', 'executeCount', 'int', 1);
CALL Pro_Temp_ColumnWork('device_inspect_plan', 'useFrequency', 'int', 1);
INSERT ignore INTO `sys_param_config`(`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`,
`paramType`, `paramExplain`, `updateTime`)
VALUES (2090, 0, '更新第三方产品信息是否选入耗材字典', 'update_third_in_rel', '0', 0, 0, '更新第三方产品信息是否选入耗材字典(0：否；1：是)', NULL);

Write Preview
Loading…
Cancel
Save