bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx

This commit is contained in:
BianLzhaoMin 2024-09-09 14:44:39 +08:00
parent 4af2fdeefe 32045be221
commit e43f8d4915
11 changed files with 231 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sgzb-auth/src/main/resources/bootstrap-sgzb_cloud_prod.yml Normal file
View File

@ -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

50
sgzb-gateway/src/main/resources/bootstrap-sgzb_cloud_prod.yml Normal file
View File

@ -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

3
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairApplyRecord.java
View File

@ -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;
/**
* 维修内容
*/

4
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java
View File

@ -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) {

30
sgzb-modules/sgzb-base/src/main/resources/bootstrap-sgzb_cloud_prod.yml Normal file
View File

@ -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}

19
sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
View File

@ -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

1
sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectLotMapper.xml
View File

@ -169,6 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="longitude != null and longitude != ''">longitude = #{longitude},</if>
<if test="latitude != null and latitude != ''">latitude = #{latitude},</if>
<if test="address != null and address != ''">address = #{address},</if>
<if test="province != null and province != ''">province = #{province},</if>
<if test="detailsAddress != null and detailsAddress != ''">details_address = #{detailsAddress},</if>
update_time = sysdate()
</set>

2
sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml
View File

@ -956,7 +956,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
WHERE
bpl.lot_id = #{lotId}
<if test="code != null and code != ''">
and lai.code = #{code}
and lai.code like concat('%', #{code}, '%')
</if>
<if test="typeId != null">
and mt.type_id = #{typeId}

30
sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_cloud_prod.yml Normal file
View File

@ -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}

2
sgzb-modules/sgzb-material/src/main/resources/mapper/material/IotMachineMapper.xml
View File

@ -168,7 +168,7 @@
sys_dic
WHERE
status = '0'
AND p_id = '124'
AND p_id = '125'
</select>
<select id="selectCodeList" resultType="com.bonus.sgzb.material.domain.IotCodeVo">
SELECT

57
sgzb-modules/sgzb-system/src/main/resources/bootstrap-sgzb_cloud_prod.yml Normal file
View File

@ -0,0 +1,57 @@
# Spring Boot Actuator V2中风险漏洞处理，禁止远程端口访问
management:
endpoint:
env:
enabled: false
# Spring
spring:
servlet:
multipart:
max-request-size: 50MB
max-file-size: 30MB
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}
#腾讯云sms
tencent:
sms:
#api秘钥标识
accessKeyId: AKIDrreCVaRKDtMcgfU5QW9iEfv67tMfldJn
#api秘钥
accessKeySecret: OXUgeMo0yhBRTGo6sVu3yiFX4rQtAzc3
#请求域名
endpoint: sms.tencentcloudapi.com
#所属区域
region: ap-guangzhou
#腾讯云申请应用id
sdkAppId: 1400494336
#签名
smsSign: 南方电网互联网
#云平台模板id 2116937-验收通知 2115503-登录验证
templateId: 2116937,2115503