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-06-13 13:07:18 +08:00
parent 8bc40d2f07 0190782966
commit b19296dbe4
5 changed files with 222 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysFile.java
View File

@ -1,23 +1,29 @@
package com.bonus.sgzb.system.api.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.util.Date;
/**
* 文件信息
*
* @author ruoyi
*/
@Data
public class SysFile
{
/**
/* *//**
* 文件名称
*/
*//*
private String name;
/**
*//**
* 文件地址
*/
*//*
private String url;
public String getName()
@ -46,5 +52,36 @@ public class SysFile
.append("name", getName())
.append("url", getUrl())
.toString();
}
}*/
/** $column.columnComment */
private Long id;
/** 模块id */
private Long modelId;
/** 文件名称 */
@ApiModelProperty(value = "文件名称")
private String fileName;
/** 文件路径 */
@ApiModelProperty(value = "文件路径")
private String fileUrl;
/** 数据字典 */
@ApiModelProperty(value = "数据字典")
private Long dicId;
/** 创建者 */
private String createBy;
private String ids;
/** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
private String size;
private String type;
private int words;
private String creator;
}

114
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/util/CommonUtil.java
View File

@ -52,11 +52,11 @@ public class CommonUtil {
if (CollectionUtils.isEmpty(list) || StringUtils.isEmpty(maType)) {
return 0;
}
BigDecimal value = new BigDecimal(new Double(0).toString());
BigDecimal value = new BigDecimal("0");
for (int i = 0; i < list.size(); i++) {
Map<String, String> map = list.get(i);
String num = Objects.isNull(map.get("num")) ? "0" : String.valueOf(map.get("num"));
BigDecimal value2 = new BigDecimal(new Double(num));
BigDecimal value2 = new BigDecimal(num);
value = value.add(value2);
}
double doubleValue = value.doubleValue();
@ -78,16 +78,16 @@ public class CommonUtil {
valueList.add(0);
return valueList;
}
BigDecimal numberValue = new BigDecimal(new Double(0).toString());
BigDecimal countValue = new BigDecimal(new Double(0).toString());
BigDecimal numberValue = new BigDecimal("0");
BigDecimal countValue = new BigDecimal("0");
for (int i = 0; i < list.size(); i++) {
if (Objects.nonNull(list.get(i).getNum()) && Objects.equals("0", list.get(i).getManageType())) {
// 编号
BigDecimal value = new BigDecimal(new Double(list.get(i).getNum()).toString());
BigDecimal value = BigDecimal.valueOf(list.get(i).getNum());
numberValue = numberValue.add(value);
} else if (Objects.nonNull(list.get(i).getNum()) && Objects.equals("1", list.get(i).getManageType())) {
// 计数
BigDecimal value = new BigDecimal(new Double(list.get(i).getNum()).toString());
BigDecimal value = BigDecimal.valueOf(list.get(i).getNum());
countValue = countValue.add(value);
}
}
@ -112,17 +112,17 @@ public class CommonUtil {
valueList.add(0);
return valueList;
}
BigDecimal jjValue = new BigDecimal(new Double(0).toString());
BigDecimal tsValue = new BigDecimal(new Double(0).toString());
BigDecimal jjValue = new BigDecimal("0");
BigDecimal tsValue = new BigDecimal("0");
for (int i = 0; i < list.size(); i++) {
if (Objects.isNull(list.get(i))) {
continue;
}
if (Objects.equals(list.get(i).getCompanyName(), CommonConstants.JJ)) {
BigDecimal value = new BigDecimal(new Double(list.get(i).getNum()).toString());
BigDecimal value = BigDecimal.valueOf(list.get(i).getNum());
jjValue = jjValue.add(value);
} else if (Objects.equals(list.get(i).getCompanyName(), CommonConstants.TS)) {
BigDecimal value = new BigDecimal(new Double(list.get(i).getNum()).toString());
BigDecimal value = BigDecimal.valueOf(list.get(i).getNum());
tsValue = tsValue.add(value);
}
}
@ -147,17 +147,15 @@ public class CommonUtil {
List<String> nameList = new ArrayList<>();
List<Integer> valueList = new ArrayList<>();
List<Integer> valueList2 = new ArrayList<>();
if (CollectionUtils.isNotEmpty(lyList)) {
for (int i = 0; i < lyList.size(); i++) {
MaterialDataVo vo = lyList.get(i);
if (Objects.nonNull(vo.getUnitName())) {
nameList.add(vo.getUnitName());
valueList.add((int) Math.round(vo.getNum()));
for (int j = 0; j < bfList.size(); j++) {
MaterialDataVo vo2 = bfList.get(j);
if (Objects.nonNull(vo2.getUnitName()) && Objects.equals(vo.getUnitName(), vo2.getUnitName())) {
valueList2.add((int) Math.round(vo2.getNum()));
}
for (int i = 0; i < lyList.size(); i++) {
MaterialDataVo vo = lyList.get(i);
if (Objects.nonNull(vo.getUnitName())) {
nameList.add(vo.getUnitName());
valueList.add((int) Math.round(vo.getNum()));
for (int j = 0; j < bfList.size(); j++) {
MaterialDataVo vo2 = bfList.get(j);
if (Objects.nonNull(vo2.getUnitName()) && Objects.equals(vo.getUnitName(), vo2.getUnitName())) {
valueList2.add((int) Math.round(vo2.getNum()));
}
}
}
@ -182,12 +180,12 @@ public class CommonUtil {
valueList.add(0);
return valueList;
}
BigDecimal planValue = new BigDecimal(new Double(0).toString());
BigDecimal realityValue = new BigDecimal(new Double(0).toString());
BigDecimal planValue = new BigDecimal("0");
BigDecimal realityValue = new BigDecimal("0");
for (int i = 0; i < list.size(); i++) {
ScrapAnalysisVo vo = list.get(i);
BigDecimal value = new BigDecimal(new Double(String.valueOf(vo.getPlanNum())));
BigDecimal value2 = new BigDecimal(new Double(String.valueOf(vo.getRealityNum())));
BigDecimal value = BigDecimal.valueOf(vo.getPlanNum());
BigDecimal value2 = BigDecimal.valueOf(vo.getRealityNum());
planValue = planValue.add(value);
realityValue = realityValue.add(value2);
}
@ -214,15 +212,15 @@ public class CommonUtil {
return valueList;
}
/*维修总量/维修合格数量/维修报废数量/待维修数量*/
BigDecimal repairValue = new BigDecimal(new Double(0).toString());
BigDecimal repairedValue = new BigDecimal(new Double(0).toString());
BigDecimal scrapValue = new BigDecimal(new Double(0).toString());
BigDecimal waitRepairedValue = new BigDecimal(new Double(0).toString());
BigDecimal repairValue = new BigDecimal("0");
BigDecimal repairedValue = new BigDecimal("0");
BigDecimal scrapValue = new BigDecimal("0");
BigDecimal waitRepairedValue = new BigDecimal("0");
for (int i = 0; i < list.size(); i++) {
ScrapAnalysisVo vo = list.get(i);
BigDecimal value = new BigDecimal(new Double(String.valueOf(vo.getRepairNum())));
BigDecimal value2 = new BigDecimal(new Double(String.valueOf(vo.getRepairedNum())));
BigDecimal value3 = new BigDecimal(new Double(String.valueOf(vo.getScrapNum())));
BigDecimal value = BigDecimal.valueOf(vo.getRepairNum());
BigDecimal value2 = BigDecimal.valueOf(vo.getRepairedNum());
BigDecimal value3 = BigDecimal.valueOf(vo.getScrapNum());
repairValue = repairValue.add(value);
repairedValue = repairedValue.add(value2);
scrapValue = scrapValue.add(value3);
@ -251,10 +249,10 @@ public class CommonUtil {
if (CollectionUtils.isEmpty(list)) {
return 0;
}
BigDecimal totalValue = new BigDecimal(new Double(0).toString());
BigDecimal totalValue = new BigDecimal("0");
for (int i = 0; i < list.size(); i++) {
ScrapAnalysisVo vo = list.get(i);
BigDecimal value = new BigDecimal(new Double(String.valueOf(vo.getNum())));
BigDecimal value = BigDecimal.valueOf(vo.getNum());
totalValue = totalValue.add(value);
}
double doubleTotalValue = totalValue.doubleValue();
@ -272,14 +270,14 @@ public class CommonUtil {
if (CollectionUtils.isEmpty(list)) {
return 0;
}
BigDecimal finalValue = new BigDecimal(new Double(0).toString());
BigDecimal totalValue = new BigDecimal(new Double(0).toString());
BigDecimal totalValue2 = new BigDecimal(new Double(0).toString());
BigDecimal finalValue = new BigDecimal("0");
BigDecimal totalValue = new BigDecimal("0");
BigDecimal totalValue2 = new BigDecimal("0");
for (int i = 0; i < list.size(); i++) {
ScrapAnalysisVo vo = list.get(i);
BigDecimal value = new BigDecimal(new Double(String.valueOf(vo.getNum())));
BigDecimal value = BigDecimal.valueOf(vo.getNum());
totalValue = totalValue.add(value);
BigDecimal value2 = new BigDecimal(new Double(String.valueOf(vo.getNum2())));
BigDecimal value2 = BigDecimal.valueOf(vo.getNum2());
totalValue2 = totalValue2.add(value2);
}
finalValue = totalValue.subtract(totalValue2);
@ -298,16 +296,16 @@ public class CommonUtil {
if (CollectionUtils.isEmpty(list)) {
return 0;
}
BigDecimal finalValue = new BigDecimal(new Double(0).toString());
BigDecimal totalValue = new BigDecimal(new Double(0).toString());
BigDecimal totalValue2 = new BigDecimal(new Double(0).toString());
BigDecimal finalValue = new BigDecimal("0");
BigDecimal totalValue = new BigDecimal("0");
BigDecimal totalValue2 = new BigDecimal("0");
for (int i = 0; i < list.size(); i++) {
ScrapAnalysisVo vo = list.get(i);
if (Objects.equals("1", vo.getType())) {
BigDecimal value = new BigDecimal(new Double(String.valueOf(vo.getNum())));
BigDecimal value = BigDecimal.valueOf(vo.getNum());
totalValue = totalValue.add(value);
} else if (Objects.equals("2", vo.getType())) {
BigDecimal value2 = new BigDecimal(new Double(String.valueOf(vo.getNum())));
BigDecimal value2 = BigDecimal.valueOf(vo.getNum());
totalValue2 = totalValue2.add(value2);
}
}
@ -328,15 +326,15 @@ public class CommonUtil {
return 0;
}
/*维修总量/维修合格数量/维修报废数量/待维修数量*/
BigDecimal repairValue = new BigDecimal(new Double(0).toString());
BigDecimal repairedValue = new BigDecimal(new Double(0).toString());
BigDecimal scrapValue = new BigDecimal(new Double(0).toString());
BigDecimal waitRepairedValue = new BigDecimal(new Double(0).toString());
BigDecimal repairValue = new BigDecimal("0");
BigDecimal repairedValue = new BigDecimal("0");
BigDecimal scrapValue = new BigDecimal("0");
BigDecimal waitRepairedValue = new BigDecimal("0");
for (int i = 0; i < list.size(); i++) {
ScrapAnalysisVo vo = list.get(i);
BigDecimal value = new BigDecimal(new Double(String.valueOf(vo.getRepairNum())));
BigDecimal value2 = new BigDecimal(new Double(String.valueOf(vo.getRepairedNum())));
BigDecimal value3 = new BigDecimal(new Double(String.valueOf(vo.getScrapNum())));
BigDecimal value = BigDecimal.valueOf(vo.getRepairNum());
BigDecimal value2 = BigDecimal.valueOf(vo.getRepairedNum());
BigDecimal value3 = BigDecimal.valueOf(vo.getScrapNum());
repairValue = repairValue.add(value);
repairedValue = repairedValue.add(value2);
scrapValue = scrapValue.add(value3);
@ -357,10 +355,10 @@ public class CommonUtil {
if (CollectionUtils.isEmpty(list)){
return 0;
}
BigDecimal totalValue = new BigDecimal(new Double(0).toString());
BigDecimal totalValue = new BigDecimal("0");
for (int i = 0; i < list.size(); i++) {
ScrapAnalysisVo vo = list.get(i);
BigDecimal value = new BigDecimal(new Double(String.valueOf(vo.getNum())));
BigDecimal value = BigDecimal.valueOf(vo.getNum());
totalValue = totalValue.add(value);
}
double doubleTotalValue = totalValue.doubleValue();
@ -376,14 +374,14 @@ public class CommonUtil {
if (CollectionUtils.isEmpty(list)){
return 0;
}
BigDecimal finalValue = new BigDecimal(new Double(0).toString());
BigDecimal totalValue = new BigDecimal(new Double(0).toString());
BigDecimal totalValue2 = new BigDecimal(new Double(0).toString());
BigDecimal finalValue = new BigDecimal("0");
BigDecimal totalValue = new BigDecimal("0");
BigDecimal totalValue2 = new BigDecimal("0");
for (int i = 0; i < list.size(); i++) {
ScrapAnalysisVo vo = list.get(i);
BigDecimal value = new BigDecimal(new Double(String.valueOf(vo.getNum())));
BigDecimal value = BigDecimal.valueOf(vo.getNum());
totalValue = totalValue.add(value);
BigDecimal value2 = new BigDecimal(new Double(String.valueOf(vo.getNum2())));
BigDecimal value2 = BigDecimal.valueOf(vo.getNum2());
totalValue2 = totalValue2.add(value2);
}
finalValue = totalValue.subtract(totalValue2);

25
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/FileInfoMapper.java Normal file
View File

@ -0,0 +1,25 @@
package com.bonus.sgzb.material.mapper;
import com.bonus.sgzb.system.api.domain.SysFile;
import java.util.List;
/**
* <p>
* Mapper 接口
* </p>
*
* @author laker
* @since 2021-08-05
*/
public interface FileInfoMapper {
/**
* 新增
* @param fileIsList
* @return int
*/
List<SysFile> selectSysFileByFileIds(String[] fileIsList);
SysFile selectSysFileInfoById(Long valueOf);
}

14
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java
View File

@ -20,6 +20,7 @@ import com.bonus.sgzb.material.vo.GlobalContants;
import com.bonus.sgzb.material.vo.RepairAuditDetailsVO;
import com.bonus.sgzb.material.vo.ScrapApplyDetailsVO;
import com.bonus.sgzb.material.vo.ScrapAudit;
import com.bonus.sgzb.system.api.domain.SysFile;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -49,6 +50,9 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
@Resource
private RepairTestInputMapper repairTestInputMapper;
@Resource
private FileInfoMapper sysFileMapper;
/**
* 查询修试审核详细repair_apply_details
@ -288,6 +292,16 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
scrapApplyDetails.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
scrapApplyDetails.setCreateTime(new Date());
scrapApplyDetails.setCompanyId((long) companyId);
scrapApplyDetails.setAuditRemark(bean.getScrapReason());
//根据fileIds获取所有的图片地址
String[] fileIsList = bean.getFileIds().split(",");
StringBuffer fileUrl = new StringBuffer();
for (int i = 0; i < fileIsList.length; i++) {
SysFile sysFile = sysFileMapper.selectSysFileInfoById(Long.valueOf(fileIsList[i]));
//对获取的图片地址进行拼接
fileUrl.append(","+sysFile.getFileUrl());
}
scrapApplyDetails.setFileUrl(fileUrl.toString());
scrapApplyDetailsMapper.insertScrapApplyDetails(scrapApplyDetails);
}
}

85
sgzb-modules/sgzb-material/src/main/resources/mapper/material/FileInfoMapper.xml Normal file
View File

@ -0,0 +1,85 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.sgzb.material.mapper.FileInfoMapper">
<resultMap type="com.bonus.sgzb.system.api.domain.SysFile" id="SysFileInfoResult">
<result property="id" column="id" />
<result property="modelId" column="model_id" />
<result property="fileName" column="file_name" />
<result property="fileUrl" column="file_url" />
<result property="dicId" column="dic_id" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
</resultMap>
<sql id="selectSysFileInfoVo">
select id, model_id, file_name, file_url, dic_id, create_by, create_time from sys_file_info
</sql>
<select id="selectSysFileInfoList" parameterType="com.bonus.sgzb.system.api.domain.SysFile" resultMap="SysFileInfoResult">
<include refid="selectSysFileInfoVo"/>
<where>
<if test="modelId != null "> and model_id = #{modelId}</if>
<if test="fileName != null and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
<if test="fileUrl != null and fileUrl != ''"> and file_url = #{fileUrl}</if>
<if test="dicId != null "> and dic_id = #{dicId}</if>
</where>
</select>
<select id="selectSysFileInfoById" parameterType="Long" resultMap="SysFileInfoResult">
<include refid="selectSysFileInfoVo"/>
where id = #{id}
</select>
<select id="selectSysFileByFileIds" resultType="com.bonus.sgzb.system.api.domain.SysFile">
<include refid="selectSysFileInfoVo"/>
where id In #{ids}
</select>
<insert id="insertFileInfo" parameterType="com.bonus.sgzb.system.api.domain.SysFile" useGeneratedKeys="true" keyProperty="id">
insert into sys_file_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="modelId != null">model_id,</if>
<if test="fileName != null">file_name,</if>
<if test="fileUrl != null">file_url,</if>
<if test="dicId != null">dic_id,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="modelId != null">#{modelId},</if>
<if test="fileName != null">#{fileName},</if>
<if test="fileUrl != null">#{fileUrl},</if>
<if test="dicId != null">#{dicId},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
</trim>
</insert>
<update id="updateSysFileInfo" parameterType="com.bonus.sgzb.system.api.domain.SysFile">
update sys_file_info
<trim prefix="SET" suffixOverrides=",">
<if test="modelId != null">model_id = #{modelId},</if>
<if test="fileName != null">file_name = #{fileName},</if>
<if test="fileUrl != null">file_url = #{fileUrl},</if>
<if test="dicId != null">dic_id = #{dicId},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteSysFileInfoById" parameterType="Long">
delete from sys_file_info where id = #{id}
</delete>
<delete id="deleteSysFileInfoByIds" parameterType="String">
delete from sys_file_info where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>