diff --git a/sgzb-auth/src/main/resources/bootstrap-sgzb_cloud_prod.yml b/sgzb-auth/src/main/resources/bootstrap-sgzb_cloud_prod.yml new file mode 100644 index 00000000..c7e50f71 --- /dev/null +++ b/sgzb-auth/src/main/resources/bootstrap-sgzb_cloud_prod.yml @@ -0,0 +1,40 @@ +# Spring Boot Actuator V2中风险漏洞处理，禁止远程端口访问 +management: + endpoint: + env: + enabled: false + +# Spring +spring: + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 192.168.1.2:8848 + namespace: sgzb_cloud_prod + config: + # 配置中心地址 + server-addr: 192.168.1.2:8848 + namespace: sgzb_cloud_prod + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + +onlineApprove: /lbcloud-oauth/oauth/token +wechatAppId: crhmaxnE +wechatAppsecret: 3893e6ed90d325f00e34583dd970a56580c05549 +getNowPersonDetailData: /lbcloud-user/user/queryLoginUserInfo +baseUrl: https://test-sso.csgmall.com.cn +appAppsecret: d8e6db9fa9bb09da0e270fa739233c823bf9c5f0 +personEasyList: /lbcloud-user/api/user/queryAndPaging/basicInfo +h5Appsecret: 3c4a67b7f6a268b4202a5328e6a1726979d5903b +h5AppId: G3NksDH2 +appsecret: 596e4863c8d112842ce820c130b236001297ea73 +appId: akvVFYgy +appAppId: u8LLfynf +getPersonDetailData: /lbcloud-user/api/user/queryById +registerPhone: /lbcloud-user/api/user/registrationByPhone +userBindUrl: /lbcloud-authority/api/RoleClient/bindDefaultSystemRole +verifyPhoneCode: /lbcloud-mbroker/api/broker/simpleVerificationCode \ No newline at end of file diff --git a/sgzb-gateway/src/main/resources/bootstrap-sgzb_cloud_prod.yml b/sgzb-gateway/src/main/resources/bootstrap-sgzb_cloud_prod.yml new file mode 100644 index 00000000..c12797ef --- /dev/null +++ b/sgzb-gateway/src/main/resources/bootstrap-sgzb_cloud_prod.yml @@ -0,0 +1,50 @@ +# Spring Boot Actuator V2中风险漏洞处理，禁止远程端口访问 +management: + endpoint: + env: + enabled: false + +# Spring +spring: + cloud: + loadbalancer: + # 关闭Ribbon的负载均衡器 + ribbon: + enabled: false + # 开启Nacos的负载均衡器 + nacos: + enabled: true + nacos: + discovery: + # 服务注册地址 + server-addr: 192.168.1.2:8848 + namespace: sgzb_cloud_prod + config: + # 配置中心地址 + server-addr: 192.168.1.2:8848 + namespace: sgzb_cloud_prod + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + sentinel: + # 取消控制台懒加载 + eager: true + transport: + # 控制台地址 + dashboard: 192.168.1.2:8718 + # nacos配置持久化 + datasource: + ds1: + nacos: + server-addr: 192.168.1.2:8848 + dataId: sentinel-sgzb-gateway + groupId: DEFAULT_GROUP + data-type: json + rule-type: gw-flow + +#加密组件 +jasypt: + encryptor: + password: Encrypt diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairApplyRecord.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairApplyRecord.java index dea956ff..d3f89ffc 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairApplyRecord.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairApplyRecord.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; +import java.math.BigDecimal; import java.util.List; /** @@ -96,7 +97,7 @@ public class RepairApplyRecord implements Serializable { * 配件单价 */ @ApiModelProperty(value = "配件单价") - private String partPrice; + private BigDecimal partPrice; /** * 维修内容 */ diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java index f4dc2bf1..4ba54fd1 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java @@ -135,7 +135,7 @@ public class RepairServiceImpl implements RepairService { partDetails.setCreateBy(loginUser.getUserid()); partDetails.setCompanyId(bean.getCompanyId()); mapper.addPart(partDetails); - bean.setPartPrice(partDetails.getPartCost()); + bean.setPartPrice(new BigDecimal(partDetails.getPartCost())); partNum += partDetails.getPartNum(); bean.setRepairContent(partDetails.getRepairContent()); bean.setPartType(partDetails.getPartType()); @@ -152,7 +152,7 @@ public class RepairServiceImpl implements RepairService { } else { bean.setSupplierId(partList.get(0).getSupplierId()); } - bean.setPartPrice(partList.get(0).getPartPrice()); + bean.setPartPrice(new BigDecimal(partList.get(0).getPartPrice())); bean.setPartNum(partList.get(0).getPartNum()); } for (RepairPartDetails partDetails : partList) { diff --git a/sgzb-modules/sgzb-base/src/main/resources/bootstrap-sgzb_cloud_prod.yml b/sgzb-modules/sgzb-base/src/main/resources/bootstrap-sgzb_cloud_prod.yml new file mode 100644 index 00000000..959ad480 --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/resources/bootstrap-sgzb_cloud_prod.yml @@ -0,0 +1,30 @@ +# Spring Boot Actuator V2中风险漏洞处理，禁止远程端口访问 +management: + endpoint: + env: + enabled: false + +# Spring +spring: + cloud: + loadbalancer: + # 关闭Ribbon的负载均衡器 + ribbon: + enabled: false + # 开启Nacos的负载均衡器 + nacos: + enabled: true + nacos: + discovery: + # 服务注册地址 + server-addr: 192.168.1.2:8848 + namespace: sgzb_cloud_prod + config: + # 配置中心地址 + server-addr: 192.168.1.2:8848 + namespace: sgzb_cloud_prod + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml index cdac1bb0..ccae0771 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml @@ -1045,12 +1045,27 @@ SELECT lad.*, mt.type_name AS typeModelName, mt1.type_name AS typeName,mt.unit_name as unitName, mt.manage_type as manageType, case WHEN mt.manage_type = '0' then '编号' else '计数' end manageTypeName, - IFNULL(mt.num,0) AS num, (lad.pre_num - IF(lad.al_num IS NULL,'0',lad.al_num)) AS outNum,mm.ma_code as maCode + CASE mt.manage_type + WHEN 0 THEN + IFNULL(subquery0.num, 0) + ELSE + IFNULL(mt.num, 0) + END as num, + (lad.pre_num - IF(lad.al_num IS NULL,'0',lad.al_num)) AS outNum,mm.ma_code as maCode FROM lease_apply_details lad LEFT JOIN ma_type mt ON lad.type_id = mt.type_id LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id - LEFT JOIN ma_machine mm ON lad.type_id = mm.type_id + LEFT JOIN (SELECT mt.type_id, + mt2.type_name AS typeName, + mt.type_name AS typeModelName, + mm.ma_code, + count(mm.ma_id) num + FROM ma_machine mm + LEFT JOIN ma_type mt ON mt.type_id = mm.type_id + LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id + WHERE mm.ma_code is not null and mm.ma_status in (15) + GROUP BY mt.type_id) AS subquery0 ON subquery0.type_id = mt.type_id WHERE lad.parennt_id = #{record.id} GROUP BY diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectLotMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectLotMapper.xml index 852676cb..c4ec6e37 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectLotMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectLotMapper.xml @@ -169,6 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" longitude = #{longitude}, latitude = #{latitude}, address = #{address}, + province = #{province}, details_address = #{detailsAddress}, update_time = sysdate() diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml index 9f635889..13ef7f92 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml @@ -956,7 +956,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE bpl.lot_id = #{lotId} - and lai.code = #{code} + and lai.code like concat('%', #{code}, '%') and mt.type_id = #{typeId} diff --git a/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_cloud_prod.yml b/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_cloud_prod.yml new file mode 100644 index 00000000..959ad480 --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_cloud_prod.yml @@ -0,0 +1,30 @@ +# Spring Boot Actuator V2中风险漏洞处理，禁止远程端口访问 +management: + endpoint: + env: + enabled: false + +# Spring +spring: + cloud: + loadbalancer: + # 关闭Ribbon的负载均衡器 + ribbon: + enabled: false + # 开启Nacos的负载均衡器 + nacos: + enabled: true + nacos: + discovery: + # 服务注册地址 + server-addr: 192.168.1.2:8848 + namespace: sgzb_cloud_prod + config: + # 配置中心地址 + server-addr: 192.168.1.2:8848 + namespace: sgzb_cloud_prod + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/IotMachineMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/IotMachineMapper.xml index 306aa208..c90e9615 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/IotMachineMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/IotMachineMapper.xml @@ -168,7 +168,7 @@ sys_dic WHERE status = '0' - AND p_id = '124' + AND p_id = '125'