From 746a1979142dda087438e6211c618547bc1fe8d2 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Tue, 27 Aug 2024 13:35:47 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=AE=A1=E8=AE=A1=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/sgzb/material/exception/ExceptionDict.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/exception/ExceptionDict.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/exception/ExceptionDict.java index 9167128..e12a462 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/exception/ExceptionDict.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/exception/ExceptionDict.java @@ -36,9 +36,9 @@ public class ExceptionDict { public static final String ERROR_OCCURRED_DURING_SCRAP_TASK_REVIEW_MSG = "报废任务审核失败!"; - public static void main(String[] args) { + /* public static void main(String[] args) { System.out.println(String.format(ExceptionDict.PARAM_IS_NULL_ERROR_MSG,"name")); - } + }*/ } From 04131d8524ce0d1b163b2bed2261b5218c8be135 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Tue, 27 Aug 2024 15:31:21 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E5=AE=A1=E8=AE=A1=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java | 1 - .../bonus/sgzb/base/controller/BmProjectInfoController.java | 5 ++--- .../bonus/sgzb/base/controller/BmProjectLotController.java | 4 ++-- .../com/bonus/sgzb/base/controller/BmUnitInfoController.java | 4 ++-- .../sgzb/material/service/impl/IotMachineServiceImpl.java | 3 +++ .../src/main/resources/bootstrap-sgzb_nw_local.yml | 4 ++-- sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml | 2 +- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java index af654f8..b52742a 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java @@ -190,7 +190,6 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { return AjaxResult.error("已领数量大于预领数量或该机具未在库"); } } catch (Exception e) { - e.printStackTrace(); return AjaxResult.error("出库失败"); } return AjaxResult.success("出库成功"); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/BmProjectInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/BmProjectInfoController.java index 01e8704..ce5da41 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/BmProjectInfoController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/BmProjectInfoController.java @@ -125,7 +125,7 @@ public class BmProjectInfoController extends BaseController{ util.exportExcel(response, list, "往来单位"); } - @Log(title = "项目管理导入", businessType = BusinessType.IMPORT) +/* @Log(title = "项目管理导入", businessType = BusinessType.IMPORT) @RequiresPermissions("system:user:import") @PostMapping("/importData") public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception @@ -134,6 +134,5 @@ public class BmProjectInfoController extends BaseController{ List bmProjectInfoList = util.importExcel(file.getInputStream()); String message = bmProjectInfoService.importBmProjectInfo(bmProjectInfoList, updateSupport); return success(message); - } - + }*/ } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/BmProjectLotController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/BmProjectLotController.java index b7339ce..fedb140 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/BmProjectLotController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/BmProjectLotController.java @@ -90,7 +90,7 @@ public class BmProjectLotController extends BaseController { return bmProjectLotService.updateBmProjectLot(bmProjectLot); } - @Log(title = "项目管理导入", businessType = BusinessType.IMPORT) +/* @Log(title = "项目管理导入", businessType = BusinessType.IMPORT) @RequiresPermissions("system:user:import") @PostMapping("/importData") public AjaxResult importData(MultipartFile file) throws Exception @@ -99,6 +99,6 @@ public class BmProjectLotController extends BaseController { List bmProjectLotList = util.importExcel(file.getInputStream()); String message = bmProjectLotService.importBmProjectLot(bmProjectLotList); return success(message); - } + }*/ } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/BmUnitInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/BmUnitInfoController.java index e79a71a..e7d2c9d 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/BmUnitInfoController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/BmUnitInfoController.java @@ -162,7 +162,7 @@ public class BmUnitInfoController extends BaseController{ ExcelUtil util = new ExcelUtil(BmUnitInfo.class); util.exportExcel(response, list, "往来单位"); } - @ApiOperation(value = "往来单位导入") +/* @ApiOperation(value = "往来单位导入") @Log(title = "往来单位导入", businessType = BusinessType.IMPORT) @RequiresPermissions("system:user:import") @PostMapping("/importData") @@ -173,6 +173,6 @@ public class BmUnitInfoController extends BaseController{ Long userId = SecurityUtils.getLoginUser().getUserid(); String message = bmUnitInfoService.importUser(bmUnitInfoList, updateSupport, userId); return success(message); - } + }*/ } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/IotMachineServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/IotMachineServiceImpl.java index c387427..5a5125d 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/IotMachineServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/IotMachineServiceImpl.java @@ -30,6 +30,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; import javax.annotation.Resource; +import java.math.BigDecimal; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; @@ -407,6 +408,8 @@ public class IotMachineServiceImpl implements IotMachineService { iotLocationVo.setBeginTime(jsonObject.getString("starttime")); iotLocationVo.setEndTime(jsonObject.getString("endtime")); iotLocationVo.setAddress(jsonObject.getString("address")); + iotLocationVo.setCallat(new BigDecimal(jsonObject.getString("callat"))); + iotLocationVo.setCallon(new BigDecimal(jsonObject.getString("callon"))); iotLocationVoList.add(iotLocationVo); } } diff --git a/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_nw_local.yml b/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_nw_local.yml index 2c378f0..d0474fe 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_nw_local.yml +++ b/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_nw_local.yml @@ -16,11 +16,11 @@ spring: discovery: # 服务注册地址 server-addr: 127.0.0.1:8848 - namespace: sgzb_nwjj + namespace: sgzb_cloud_dev_nw config: # 配置中心地址 server-addr: 127.0.0.1:8848 - namespace: sgzb_nwjj + namespace: sgzb_cloud_dev_nw # 配置文件格式 file-extension: yml # 共享配置 diff --git a/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml index d0a0f1e..1846508 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml +++ b/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml @@ -5,4 +5,4 @@ spring: name: sgzb-material profiles: # 环境配置 - active: sgzb_cloud_local \ No newline at end of file + active: sgzb_nw_local \ No newline at end of file From 468a1e7635f58ff20087fc8ecb26047282bb12fd Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Tue, 27 Aug 2024 17:37:24 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E5=AE=A1=E8=AE=A1=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/service/impl/BackApplyServiceImpl.java | 11 +++-------- .../service/impl/MaWholeSetServiceImpl.java | 1 - .../service/impl/WorkSiteDirectManageImpl.java | 13 +++++++------ 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java index 8a20bb5..82c52b4 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java @@ -223,11 +223,8 @@ public class BackApplyServiceImpl implements BackApplyService { roles = SecurityUtils.getLoginUser().getRoles(); userid = SecurityUtils.getLoginUser().getUserid(); companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId(); - } catch (NullPointerException e) { - e.printStackTrace(); - return AjaxResult.error("获取用户信息失败:{}", e); } catch (Exception e) { - e.printStackTrace(); + return AjaxResult.error("获取用户信息失败:{}", e); } int num = 0; if (!StringUtils.isEmpty(bean.getIds())) { @@ -425,6 +422,7 @@ public class BackApplyServiceImpl implements BackApplyService { /** * 退料批量审核-审核(web) + * * @param dto * @return */ @@ -437,11 +435,8 @@ public class BackApplyServiceImpl implements BackApplyService { roles = SecurityUtils.getLoginUser().getRoles(); userid = SecurityUtils.getLoginUser().getUserid(); companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId(); - } catch (NullPointerException e) { - e.printStackTrace(); - return AjaxResult.error("获取用户信息失败:{}", e); } catch (Exception e) { - e.printStackTrace(); + return AjaxResult.error("获取用户信息失败:{}", e); } if (CollectionUtils.isNotEmpty(dto.getBackApplyList())) { for (BackApplyListDto backApplyListDto : dto.getBackApplyList()) { diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/MaWholeSetServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/MaWholeSetServiceImpl.java index bf30c2d..f1ade54 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/MaWholeSetServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/MaWholeSetServiceImpl.java @@ -159,7 +159,6 @@ public class MaWholeSetServiceImpl implements MaWholeSetService { throw new RuntimeException("配套名称已重复，请重新输入"); }*/ } catch (Exception e) { - e.printStackTrace(); return AjaxResult.error(ExceptionEnum.UPDATE_TO_DATABASE.getCode(), ExceptionEnum.UPDATE_TO_DATABASE.getMsg()); } return AjaxResult.success("修改成功", res); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java index 379471c..9ce8dba 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java @@ -13,6 +13,7 @@ import com.bonus.sgzb.material.service.*; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; + import javax.annotation.Resource; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -356,7 +357,7 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService { } } catch (Exception e) { - e.printStackTrace(); + log.error(e.getMessage()); } return res; } @@ -381,7 +382,7 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService { throw new RuntimeException("createBackApplyInfoAndDetails异常"); } } catch (Exception e) { - e.printStackTrace(); + log.error(e.getMessage()); } return res; @@ -508,7 +509,7 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService { } } catch (Exception e) { - e.printStackTrace(); + log.error(e.getMessage()); } return res; @@ -561,7 +562,7 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService { } } catch (Exception e) { - e.printStackTrace(); + log.error(e.getMessage()); } return res; } @@ -586,7 +587,7 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService { taskId = Integer.valueOf(task.getId()); } } catch (Exception e) { - e.printStackTrace(); + log.error(e.getMessage()); } return taskId; @@ -599,7 +600,7 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService { DirectApplyInfo directApplyInfos = getDirectApplyInfoById(directApplyInfoDetails.getId()); directApplyInfos.setStatus("1"); directApplyInfos.setAuditor(SecurityUtils.getLoginUser().getUsername()); - directApplyInfos.setAuditTime(DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")); + directApplyInfos.setAuditTime(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss")); res = refuseDirectApplyInfo(directApplyInfos); } else { return res; From 184f07d25c0ba76a04d68cee22f51636ee953987 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Fri, 30 Aug 2024 15:54:45 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sgzb-auth/src/main/resources/bootstrap.yml | 2 +- sgzb-gateway/src/main/resources/bootstrap.yml | 2 +- sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml | 2 +- sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sgzb-auth/src/main/resources/bootstrap.yml b/sgzb-auth/src/main/resources/bootstrap.yml index 82f42c7..0117fe0 100644 --- a/sgzb-auth/src/main/resources/bootstrap.yml +++ b/sgzb-auth/src/main/resources/bootstrap.yml @@ -9,4 +9,4 @@ spring: name: sgzb-auth profiles: # 环境配置 - active: sgzb_cloud_local + active: sgzb_cq_local diff --git a/sgzb-gateway/src/main/resources/bootstrap.yml b/sgzb-gateway/src/main/resources/bootstrap.yml index 6ffe4e5..c26d13d 100644 --- a/sgzb-gateway/src/main/resources/bootstrap.yml +++ b/sgzb-gateway/src/main/resources/bootstrap.yml @@ -9,4 +9,4 @@ spring: name: sgzb-gateway profiles: # 环境配置 - active: sgzb_cloud_local + active: sgzb_cq_local diff --git a/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml index 1846508..34dca85 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml +++ b/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml @@ -5,4 +5,4 @@ spring: name: sgzb-material profiles: # 环境配置 - active: sgzb_nw_local \ No newline at end of file + active: sgzb_cq_local \ No newline at end of file diff --git a/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml index 7a0e886..b24ca0b 100644 --- a/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml +++ b/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml @@ -9,4 +9,4 @@ spring: name: sgzb-system profiles: # 环境配置 - active: sgzb_cloud_local + active: sgzb_cq_local From fcf9ea9deb3006c72b6ddaf851598b8c122ac74d Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Fri, 30 Aug 2024 15:56:57 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E6=88=90=E5=A5=97=E6=9C=BA=E5=85=B7bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MaWholeSetController.java | 4 +-- .../bonus/sgzb/material/domain/MaWholeVo.java | 31 ++++++++++++++++++- .../mapper/material/MaWholeSetMapper.xml | 4 +-- 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/MaWholeSetController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/MaWholeSetController.java index baa4262..778fd7f 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/MaWholeSetController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/MaWholeSetController.java @@ -66,8 +66,8 @@ public class MaWholeSetController extends BaseController { * @return */ @ApiOperation("查询整套抱杆明细") - @PostMapping("/selectListById") - public TableDataInfo selectListById(@ApiParam(value = "查询信息") @RequestBody MaWholeSetDto dto) { + @GetMapping("/selectListById") + public TableDataInfo selectListById(@ApiParam(value = "查询信息") MaWholeSetDto dto) { log.info("查询整套抱杆明细：{}", dto); startPage(); List list = maWholeSetService.selectListById(dto); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MaWholeVo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MaWholeVo.java index 4181daf..c61a282 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MaWholeVo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MaWholeVo.java @@ -1,10 +1,13 @@ package com.bonus.sgzb.material.domain; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.Date; + /** * 整套抱杆最外层表单vo * @Author ma_sh @@ -18,16 +21,42 @@ public class MaWholeVo { /** 主键ID */ @ApiModelProperty(value = "主键ID") private Integer id; + /** 主键ID */ + @ApiModelProperty(value = "设备类型（1：主体设备 2：配套设备）") + private Integer ascriptionType; + /** 设备id */ + @ApiModelProperty(value = "设备id") + private Integer deviceTypeId; + /** 设备id */ + @ApiModelProperty(value = "设备数量") + private Integer deviceNum; /** 机具名称 */ @ApiModelProperty(value = "机具名称") private String typeName; + /** 机具名称 */ + @ApiModelProperty(value = "配套设备类型") + private String deviceAscription; + /** 机具名称 */ + @ApiModelProperty(value = "机具名称") + private String deviceType; /** 规格型号 */ @ApiModelProperty(value = "规格型号") private String typeModelName; + /** 配套名称 */ + @ApiModelProperty(value = "配套名称") + private String wholeTypeName; + /** 创建人 */ + @ApiModelProperty(value = "创建人") + private String nickName; + /** 创建日期 */ + @ApiModelProperty(value = "创建日期") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + /** 套装所需配件数量 */ - @ApiModelProperty(value = "套装所需配件数量") + @ApiModelProperty(value = "套装所需配件种类数量") private Integer totalNum; } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/MaWholeSetMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/MaWholeSetMapper.xml index 28747aa..f225670 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/MaWholeSetMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/MaWholeSetMapper.xml @@ -41,8 +41,8 @@ - insert into ma_whole_set (type_id,parent_id,part_num,whole_type_name,create_by,ascription_type,create_time,status,company_id) - values(#{item.typeId},#{item.parentId},#{item.totalNum},#{item.wholeTypeName},#{item.createBy},#{item.ascriptionType}, now(),1,#{item.companyId}) + insert into ma_whole_set (type_id,parent_id,part_num,whole_type_name,create_by,ascription_type,create_time,status) + values(#{item.typeId},#{item.parentId},#{item.totalNum},#{item.wholeTypeName},#{item.createBy},#{item.ascriptionType}, now(),1) From 72ac98b92d84e8859deb450c99cee6c25e5afa4e Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Fri, 30 Aug 2024 18:01:35 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E6=88=90=E5=A5=97=E6=9C=BA=E5=85=B7bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/material/MaWholeSetMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/MaWholeSetMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/MaWholeSetMapper.xml index f225670..36fd7db 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/MaWholeSetMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/MaWholeSetMapper.xml @@ -45,9 +45,9 @@ values(#{item.typeId},#{item.parentId},#{item.totalNum},#{item.wholeTypeName},#{item.createBy},#{item.ascriptionType}, now(),1) - + delete from ma_whole_set - where parent_id = #{id} and whole_type_name = #{wholeTypeName} + where parent_id = #{id} + + From 088fdd2ed19b6693a44563cf54f97fd5b6fa05f4 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 3 Sep 2024 18:00:27 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E6=99=BA=E6=85=A7=E5=B7=A5=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java | 6 +++--- .../src/main/resources/bootstrap-sgzb_nw_dev.yml | 3 ++- .../src/main/resources/bootstrap-sgzb_nw_local.yml | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index 4e9c283..c632b38 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -44,13 +44,13 @@ import java.util.stream.Collectors; @Slf4j public class TmTaskServiceImpl implements TmTaskService { - @Value("zgzb.intelligentUrl") + @Value("${sgzb.intelligentUrl}") private String intelligentUrl; - @Value("zgzb.intelligentAppKey") + @Value("${sgzb.intelligentAppKey}") private String intelligentAppKey; - @Value("zgzb.intelligentAesKey") + @Value("${sgzb.intelligentAesKey}") private String intelligentAesKey; @Resource diff --git a/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_nw_dev.yml b/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_nw_dev.yml index 5a3d167..e8a73e2 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_nw_dev.yml +++ b/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_nw_dev.yml @@ -39,6 +39,7 @@ sgzb: settlementJobDay: 1 settlementJobCron: "0 0 1 1 * ?" zlptUrl: http://test-rental.zhgkxt.com/proxy/item-center/supply/item/pushNotifications + intelligentUrl: http://www.zhgkxt.com/api/clientapi/public/externalApi intelligentAppKey: abc123 intelligentAesKey: abcdefghijklmnop - intelligentUrl: http://www.zhgkxt.com/api/clientapi/public/externalApi + diff --git a/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_nw_local.yml b/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_nw_local.yml index 30f32bd..dc72f69 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_nw_local.yml +++ b/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_nw_local.yml @@ -39,7 +39,8 @@ sgzb: settlementJobDay: 1 settlementJobCron: "0 0 1 1 * ?" zlptUrl: http://test-rental.zhgkxt.com/proxy/item-center/supply/item/pushNotifications + intelligentUrl: http://www.zhgkxt.com/api/clientapi/public/externalApi intelligentAppKey: abc123 intelligentAesKey: abcdefghijklmnop - intelligentUrl: http://www.zhgkxt.com/api/clientapi/public/externalApi + From 245306c2e1e8ffcb18a54945294b8e50ade01294 Mon Sep 17 00:00:00 2001 From: 15856 <15856818120@163.com> Date: Wed, 4 Sep 2024 09:20:41 +0800 Subject: [PATCH 12/12] =?UTF-8?q?http=E8=AF=B7=E6=B1=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/common/core/utils/HttpHelper.java | 7 +++--- .../service/impl/MaMachineServiceImpl.java | 22 +++++-------------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/HttpHelper.java b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/HttpHelper.java index a1184bd..d19db4c 100644 --- a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/HttpHelper.java +++ b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/HttpHelper.java @@ -17,6 +17,7 @@ import java.io.*; import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URL; +import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; @@ -26,11 +27,11 @@ public class HttpHelper { System.out.println("JSONBody-=========:" + JSONBody); CloseableHttpClient httpClient = HttpClients.createDefault(); HttpPost httpPost = new HttpPost(url); - httpPost.addHeader("Content-Type", "application/json"); - httpPost.setEntity(new StringEntity(JSONBody)); + httpPost.addHeader("Content-Type", "application/json; charset=UTF-8"); + httpPost.setEntity(new StringEntity(JSONBody,StandardCharsets.UTF_8)); CloseableHttpResponse response = httpClient.execute(httpPost); HttpEntity entity = response.getEntity(); - String responseContent = EntityUtils.toString(entity, "UTF-8"); + String responseContent = EntityUtils.toString(entity, StandardCharsets.UTF_8); response.close(); httpClient.close(); return responseContent; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java index 770b74a..66239ae 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java @@ -187,22 +187,21 @@ public class MaMachineServiceImpl implements MaMachineService { if (maMachineList.isEmpty()){ throw new ServiceException(String.format(ExceptionDict.PARAM_IS_NULL_ERROR_MSG,"maMachineList"), ExceptionDict.PARAM_IS_NULL_ERROR); } - //遍历推送，防止数据量过大 String content = JSONObject.toJSONString(maMachineList); String encrypt; try { - encrypt = RsaUtil.encryptByPublicKey(content, Constants.publicKey); + //encrypt = RsaUtil.encryptByPublicKey(content, Constants.publicKey); Map map = new HashMap(); - map.put("body", encrypt); + map.put("body", content); String body = JSONObject.toJSONString(map); String data = HttpHelper.sendHttpPost(zlptUrl, body); log.info("dataString-=========:" + data); //对返回的结果进行处理 - resultDataHandler(data); + // resultDataHandler(data); } catch (Exception e) { // throw new RuntimeException(e); - return AjaxResult.success("请求成功！"); + return AjaxResult.error("推送失败！"); } return AjaxResult.success("请求成功！"); } @@ -211,22 +210,13 @@ public class MaMachineServiceImpl implements MaMachineService { JSONObject object = JSONObject.parseObject(data); System.err.println(data); String code = object.getString("code"); - if ("200".equals(code)) { + if ("0".equals(code)) { String dataResultString = object.getString("data"); // 数据解密 String dataArrayString = RsaUtil.decryptByPrivateKey(dataResultString, Constants.publicKey); log.info("dataArrayString-=========:" + dataArrayString); - JSONArray dataArray = JSONArray.parseArray(dataArrayString); - if (dataArray != null && dataArray.size() > 0) { - - - }else { - - } - } else { - + throw new Exception("推送失败！"); } - } }