Skip to content

A
amos-boot-biz
Commit f4d44d9e authored by 任刚's avatar 任刚
Browse files
Options

部件表单编辑

parent d7fddee7
Show whitespace changes
Inline Side-by-side
Showing with 233 additions and 160 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/dto/DetailssDTO.java 0 → 100644
View file @ f4d44d9e
/**
* @Time: 2022/7/27 16:38
* @Author: 任刚
* @File：DetailssDTO.class
*/
package com.yeejoin.equipmanage.common.entity.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import java.math.BigDecimal;
import java.util.Date;
public class DetailssDTO {
@ApiModelProperty(value = "id")
private Long id;
@ApiModelProperty(value = "名称")
private String name;
@ApiModelProperty(value = "部件编码")
private String eqcode;
@ApiModelProperty(value = "部件型号")
private String standard;
@ApiModelProperty(value = "存放位置")
private String area;
@ApiModelProperty(value = "生产厂家")
private String brand;
@JsonFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "出厂时间")
private Date openDate;
@ApiModelProperty(value = "工作时间")
private BigDecimal maintenanceCycle;
@ApiModelProperty(value = "所属单位")
private String remark;
@JsonFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "入库时间")
private Date joinDate;
@ApiModelProperty(value="状态")
private int status;
@ApiModelProperty(value = "原因分析")
private String reason;
@ApiModelProperty(value = "处置措施")
private String measure;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/vo/DetailssAmountVO.java 0 → 100644
View file @ f4d44d9e
/**
* @Time: 2022/7/27 16:19
* @Author: 任刚
* @File：DetailssAmountVO.class
*/
package com.yeejoin.equipmanage.common.entity.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
@Data
public class DetailssAmountVO {
@ApiModelProperty(value = "id")
private Long id;
@ApiModelProperty(value = "名称")
private String name;
@ApiModelProperty(value = "部件编码")
private String eqcode;
@ApiModelProperty(value = "部件型号")
private String standard;
@ApiModelProperty(value = "存放位置")
private String area;
@ApiModelProperty(value = "生产厂家")
private String brand;
@JsonFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "出厂时间")
private Date openDate;
@ApiModelProperty(value = "工作时间")
private BigDecimal maintenanceCycle;
@ApiModelProperty(value = "所属单位")
private String remark;
@JsonFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "入库时间")
private Date joinDate;
@ApiModelProperty(value="状态")
private String status;
@ApiModelProperty(value = "原因分析")
private String reason;
@ApiModelProperty(value = "处置措施")
private String measure;
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentCategoryController.java
View file @ f4d44d9e
......@@ -376,21 +376,21 @@ public class EquipmentCategoryController extends AbstractBaseController {
@ApiOperation(httpMethod = "GET", value = "根据行业过滤树形结构返回", notes = "根据行业过滤树形结构返回")
public List<EquipmentCategory> industryTreeList(@RequestParam String code) {
List<EquipmentCategory> list = new ArrayList<>();
// if (!"".equals(code)) {
if (!"".equals(code)) {
// 判断缓存中是否有该数据
// String equipmentTreeListIndustryKey = equipmentTreeListIndustry + "-" + code;
// boolean treeListFlag = redisUtils.hasKey(equipmentTreeListIndustryKey);
// if (treeListFlag) {
// if (redisUtils.get(equipmentTreeListIndustryKey) != null) {
// list = JSONObject.parseArray(redisUtils.get(equipmentTreeListIndustryKey).toString(),
// EquipmentCategory.class);
// }
// } else {
//// 缓存中没有, 读取并写入缓存
String equipmentTreeListIndustryKey = equipmentTreeListIndustry + "-" + code;
boolean treeListFlag = redisUtils.hasKey(equipmentTreeListIndustryKey);
if (treeListFlag) {
if (redisUtils.get(equipmentTreeListIndustryKey) != null) {
list = JSONObject.parseArray(redisUtils.get(equipmentTreeListIndustryKey).toString(),
EquipmentCategory.class);
}
} else {
// 缓存中没有, 读取并写入缓存
list = getIndustryTreeList(code);
// redisUtils.set(equipmentTreeListIndustryKey, JSONObject.toJSONString(list), 0);
// }
// }
redisUtils.set(equipmentTreeListIndustryKey, JSONObject.toJSONString(list), 0);
}
}
return list;
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentDetailController.java
View file @ f4d44d9e
......@@ -16,6 +16,7 @@ import com.yeejoin.equipmanage.common.vo.EquipmentPar;
import com.yeejoin.equipmanage.dto.ExcelDto;
import com.yeejoin.equipmanage.fegin.JcsFeign;
import com.yeejoin.equipmanage.mapper.EquipmentDetailMapper;
import com.yeejoin.equipmanage.mapper.EquipmentParamsMapper;
import com.yeejoin.equipmanage.mapper.ManufacturerInfoMapper;
import com.yeejoin.equipmanage.mapper.StockDetailMapper;
import com.yeejoin.equipmanage.service.*;
......@@ -65,6 +66,9 @@ public class EquipmentDetailController extends AbstractBaseController {
@Autowired
EquipmentDetailMapper equipmentDetailMapper;
@Autowired
EquipmentParamsMapper equipmentParamsMapper;
@Autowired
private StockDetailMapper stockDetailMapper;
@Autowired
......@@ -115,17 +119,22 @@ public class EquipmentDetailController extends AbstractBaseController {
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
public EquipmentDate saveEquipmentDetail(@RequestBody EquipmentDate equipmentDate) {
// EquipmentSpecific vo = equipmentDate.getEquipmentSpecific();
// String sysCode = vo.getCode();
//
// if (StringUtils.isNotEmpty(sysCode) && StringUtils.isNotEmpty(sysCode.trim())){
// int code = equipmentSpecificSerivce.count(new QueryWrapper<EquipmentSpecific>().eq("code", sysCode.trim()));
// if (code != 0 ) {
// throw new BadRequest("设备编码填写重复，请重新输入！");
// }
// }
EquipmentDetail de = equipmentDate.getEquipmentDetail();
String eqcode = de.getEqcode();
// Long aLong = new Long("1481079154903384065");
// equipmentDate.getEquipmentDetail().setEquipmentId(aLong);
EquipmentSpecific vo = equipmentDate.getEquipmentSpecific();
String sysCode = vo.getCode();
if (StringUtils.isNotEmpty(sysCode) && StringUtils.isNotEmpty(sysCode.trim())){
int code = equipmentSpecificSerivce.count(new QueryWrapper<EquipmentSpecific>().eq("code", sysCode.trim()));
if (StringUtils.isNotEmpty(eqcode) && StringUtils.isNotEmpty(eqcode.trim())){
int code = iEquipmentDetailService.count(new QueryWrapper<EquipmentDetail>().eq("eq_code", eqcode.trim()));
if (code != 0 ) {
throw new BadRequest("设备编码填写重复，请重新输入！");
throw new BadRequest("部件编码填写重复，请重新输入！");
}
}
......@@ -137,7 +146,7 @@ public class EquipmentDetailController extends AbstractBaseController {
// }
// }
EquipmentDate date = equipmentSpecificSerivce.equipmentSpecificCreate(equipmentDate, getSelectedOrgInfo(), getUserInfo());
equipmentDate.getEquipmentParams().setCode(equipmentDate.getEquipmentDetail().getCode());
equipmentDate.getEquipmentParams().setCode(equipmentDate.getEquipmentDetail().getEqcode());
iEquipmentParamsService.saveOne(equipmentDate.getEquipmentParams());
// TODO 后续判断成功，执行同步
Long equipmentId = date.getEquipmentDetail().getEquipmentId();
......@@ -206,6 +215,9 @@ public class EquipmentDetailController extends AbstractBaseController {
EquipmentSpecific equipmentSpecific = equipmentSpecificSerivce.getById(id);
equipmentSpecific.setFullqrCode("01#" + equipmentSpecific.getQrCode());
EquipmentDetail equipmentDetail = iEquipmentDetailService.getOneById(equipmentSpecific.getEquipmentDetailId());
Map<String, Object> map = new HashMap<>();
map.put("code",equipmentDetail.getEqcode());
EquipmentParams equipmentParams = equipmentParamsMapper.selectByMap(map).get(0);
StockDetail stockDetail = null;
if(stockDetailId != null){
//解决灭火药剂，有多个货位状态问题
......@@ -223,6 +235,7 @@ public class EquipmentDetailController extends AbstractBaseController {
equipmentSpecific.setStock(iStockService.getById(stockDetail.getStockId()));
}
equipmentDate.setEquipmentDetail(equipmentDetail);
equipmentDate.setEquipmentParams(equipmentParams);
equipmentDate.setEquipmentSpecific(equipmentSpecific);
return equipmentDate;
}
......@@ -237,21 +250,31 @@ public class EquipmentDetailController extends AbstractBaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "PUT", value = "修改", notes = "修改")
public EquipmentDate updateByIdEquipmentDetail(HttpServletRequest request, @RequestBody EquipmentDate equipmentDate) {
EquipmentSpecific vo = equipmentDate.getEquipmentSpecific();
String sysCode = vo.getCode();
if (StringUtils.isNotEmpty(sysCode) && StringUtils.isNotEmpty(sysCode.trim())){
int code = equipmentSpecificSerivce.count(new QueryWrapper<EquipmentSpecific>().eq("code", vo.getCode()).ne("id",vo.getId()));
if (code > 0){
throw new BadRequest("设备编码重复");
}
}
String iot = vo.getIotCode();
if (StringUtils.isNotEmpty(iot) && StringUtils.isNotEmpty(iot.trim())){
int iotCode = equipmentSpecificSerivce.count(new QueryWrapper<EquipmentSpecific>().eq("iot_code", vo.getIotCode()).ne("id",vo.getId()));
if (iotCode > 0){
throw new BadRequest("设备物联编码重复");
EquipmentDetail de = equipmentDate.getEquipmentDetail();
String eqcode = de.getEqcode();
if (StringUtils.isNotEmpty(eqcode) && StringUtils.isNotEmpty(eqcode.trim())){
int code = iEquipmentDetailService.count(new QueryWrapper<EquipmentDetail>().eq("eq_code", eqcode.trim()));
if (code != 0 ) {
throw new BadRequest("部件编码填写重复，请重新输入！");
}
}
// EquipmentSpecific vo = equipmentDate.getEquipmentSpecific();
// String sysCode = vo.getCode();
// if (StringUtils.isNotEmpty(sysCode) && StringUtils.isNotEmpty(sysCode.trim())){
// int code = equipmentSpecificSerivce.count(new QueryWrapper<EquipmentSpecific>().eq("code", vo.getCode()).ne("id",vo.getId()));
// if (code > 0){
// throw new BadRequest("设备编码重复");
// }
// }
// String iot = vo.getIotCode();
// if (StringUtils.isNotEmpty(iot) && StringUtils.isNotEmpty(iot.trim())){
// int iotCode = equipmentSpecificSerivce.count(new QueryWrapper<EquipmentSpecific>().eq("iot_code", vo.getIotCode()).ne("id",vo.getId()));
// if (iotCode > 0){
// throw new BadRequest("设备物联编码重复");
// }
// }
//1.更新装备实例Detail数据
EquipmentDetail equipmentDetail = equipmentDate.getEquipmentDetail();
EquipmentParams equipmentParams = equipmentDate.getEquipmentParams();
......@@ -411,52 +434,7 @@ public class EquipmentDetailController extends AbstractBaseController {
return page;
}
/**
* 列表分页查询
*
* @return
*/
@RequestMapping(value = "/listEqu", method = RequestMethod.GET)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
public IPage<EquipmentPar> listEqu(String pageNum, String pageSize, EquipmentPar equipmentPar) {
Page<EquipmentPar> pageBean;
QueryWrapper<EquipmentDetail> equipmentDetailQueryWrapper = new QueryWrapper<>();
Class<? extends EquipmentPar> aClass = equipmentPar.getClass();
Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
try {
field.setAccessible(true);
Object o = field.get(equipmentPar);
if (o != null) {
Class<?> type = field.getType();
String name = NameUtils.camel2Underline(field.getName());
if (type.equals(Integer.class)) {
Integer fileValue = (Integer) field.get(equipmentPar);
equipmentDetailQueryWrapper.eq(name, fileValue);
} else if (type.equals(Long.class)) {
Long fileValue = (Long) field.get(equipmentPar);
equipmentDetailQueryWrapper.eq(name, fileValue);
} else if (type.equals(String.class)) {
String fileValue = (String) field.get(equipmentPar);
equipmentDetailQueryWrapper.eq(name, fileValue);
} else {
String fileValue = (String) field.get(equipmentPar);
equipmentDetailQueryWrapper.eq(name, fileValue);
}
}
} catch (Exception e) {
}
});
IPage<EquipmentPar> page;
if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
pageBean = new Page<>(0, Long.MAX_VALUE);
} else {
pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
}
page = iEquipmentDetailService.getEqur(pageBean,equipmentPar);
return page;
}
/**
* <pre>
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentDetailMapper.java
View file @ f4d44d9e
......@@ -23,11 +23,6 @@ public interface EquipmentDetailMapper extends BaseMapper<EquipmentDetail> {
List<EquipmentDetail> page(@Param("offset") long offset, @Param("size") long size,
@Param("equip") EquipmentDetail equipmentDetail);
List<EquipmentPar> pagequ(@Param("offset") long offset, @Param("size") long size,
@Param("equip") EquipmentPar equipmentPar);
int countequ(@Param("equip") EquipmentPar equipmentPar);
int count(@Param("equip") EquipmentDetail equipmentDetail);
List<EquipmentDetail> pageCategory(@Param("offset") long offset, @Param("size") long size,
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEquipmentDetailService.java
View file @ f4d44d9e
......@@ -35,6 +35,4 @@ public interface IEquipmentDetailService extends IService<EquipmentDetail> {
String checkDelete( List<Long> ids);
Page<EquipmentPar> getEqur(Page<EquipmentPar> pageBean, EquipmentPar equipmentPar);
// List<EquipmentPar> getEqur();
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentDetailServiceImpl.java
View file @ f4d44d9e
......@@ -35,6 +35,9 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
private EquipmentDetailMapper equipmentDetailMapper;
@Autowired
private EquipmentParamsMapper equipmentParamsMapper;
@Autowired
private EquipmentMapper equipmentMapper;
@Autowired
......@@ -259,16 +262,7 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
}
// @Override
// public List<EquipmentPar> getEqur() {
// return equipmentDetailMapper.equpar();
public Page<EquipmentPar> getEqur(Page<EquipmentPar> pageBean, EquipmentPar equipmentPar) {
List<EquipmentPar> list = equipmentDetailMapper.pagequ(pageBean.offset(), pageBean.getSize(), equipmentPar);
int count = equipmentDetailMapper.countequ(equipmentPar);
pageBean.setRecords(list);
pageBean.setTotal(count);
return pageBean;
}
......
amos-boot-system-equip/src/main/resources/mapper/EquipmentDetailMapper.xml
View file @ f4d44d9e
......@@ -68,58 +68,7 @@
LIMIT #{offset},#{size}
</select>
<select id="pagequ"
resultMap="EquipmentDetailMap">
SELECT
wled.name,
wled.code,
wled.remark,
wled.manufacturer_id,
wled.maintenance_cycle,
wled.standard,
wled.brand,
wled.production_date,
wled.update_date,
wled.create_date,
wled.area,
wlun.status,
wlun.reason,
wlun.measure,
wec.name
FROM
wl_equipment_detail wled
LEFT JOIN
wl_equipment_params wlun ON wlun.code =
wled.code
LEFT JOIN
wl_equipment_category wec ON wec.id =
wled.manufacturer_id
ORDER BY wled.id DESC
LIMIT #{offset},#{size}
</select>
<select id="equpar" resultMap="EquipmentDetailMap">
SELECT
wled.name,
wled.code,
wled.remark,
wled.manufacturer_id,
wled.maintenance_cycle,
wled.standard,
wled.brand,
wled.production_date,
wled.update_date,
wled.create_date,
wled.area,
wlun.status,
wlun.reason,
wlun.measure
FROM wl_equipment_detail wled
LEFT JOIN wl_equipment_params wlun ON wled.code = wlun.code
LEFT JOIN wl_equipment_category wec ON wled.manufacturer_id = wec.id
ORDER BY
wled.create_date DESC
</select>
<select id="count" resultType="Integer">
SELECT
COUNT(1)
......@@ -145,17 +94,6 @@
</where>
</select>
<select id="countequ" resultType="Integer">
SELECT
COUNT(1)
FROM
wl_equipment_detail wed
LEFT JOIN wl_equipment_params we ON
we.code =
wed.code
LEFT JOIN wl_equipment_category wec ON wec.id =
wed.manufacturer_id
</select>
<select id="pageCategory"
resultType="com.yeejoin.equipmanage.common.entity.EquipmentDetail">
......
amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
View file @ f4d44d9e
......@@ -33,6 +33,18 @@
<result property="iotCode" column="iotCode"></result>
<result property="eqtype" column="eqtype"></result>
</resultMap>
<!-- <resultMap id="DetailssAmountList" type="com.yeejoin.equipmanage.common.entity.vo.DetailssAmountVO">-->
<!-- <result column="id" property="id"></result>-->
<!-- <result column="standard" property="standard"></result>-->
<!-- <result column="name" property="name"></result>-->
<!-- <result column="remark" property="remark"></result>-->
<!-- <result column="eq_code" property="eqcode"></result>-->
<!-- <result column="join_date" property="joinDate"></result>-->
<!-- <result column="open_date" property="openDate"></result>-->
<!-- <result column="reason" property="reason"></result>-->
<!-- <result column="STATUS" property="status"></result>-->
<!-- <result column="measure" property="measure"></result>-->
<!-- </resultMap>-->
<select id="getEquiplistBySystemId" resultMap="EquiplistBySystemId">
SELECT
spe.id,
......@@ -583,6 +595,46 @@
</where>
ORDER BY d.createDate DESC
</select>
<!-- <select id="getColaCategoryAmountList" resultMap="DetailssAmountList">-->
<!-- <if test="equipTypeAmountPage.type == 'equipment' or codeHead==null or codeHead=='' or codeHead==' '">-->
<!-- SELECT-->
<!-- *-->
<!-- FROM-->
<!-- (-->
<!-- SELECT-->
<!-- wles.id,-->
<!-- wled.standard,-->
<!-- wled.NAME name,-->
<!-- 'equipment' AS type,-->
<!-- CASE-->
<!-- wlp.`status`-->
<!-- WHEN '0' THEN-->
<!-- '正常'-->
<!-- WHEN '1' THEN-->
<!-- '故障' ELSE '错误'-->
<!-- END AS STATUS,-->
<!-- wled.remark,-->
<!-- wled.brand,-->
<!-- wled.eq_code,-->
<!-- wled.join_date,-->
<!-- wled.open_date,-->
<!-- wlp.reason,-->
<!-- wlp.measure-->
<!-- FROM-->
<!-- ( SELECT id, qr_code, CODE, iot_code, create_date, equipment_detail_id, system_id FROM wl_equipment_specific ) wles-->
<!-- LEFT JOIN ( SELECT id, amount, STATUS, equipment_specific_id, warehouse_structure_id FROM wl_stock_detail ) wlsd ON wlsd.equipment_specific_id = wles.id-->
<!-- LEFT JOIN wl_warehouse_structure wlws ON wlsd.warehouse_structure_id = wlws.id-->
<!-- LEFT JOIN wl_equipment_detail wled ON wles.equipment_detail_id = wled.id-->
<!-- LEFT JOIN wl_equipment_params wlp ON wlp.code = wled.eq_code-->
<!-- LEFT JOIN wl_equipment wle ON wle.id = wled.equipment_id-->
<!-- LEFT JOIN wl_unit wlun ON wle.unit_id = wlun.id-->
<!-- LEFT JOIN wl_manufacturer_info wlai ON wled.manufacturer_id = wlai.id-->
<!-- LEFT JOIN wl_equipment_category wec ON wle.category_id = wec.id-->
<!-- WHERE 1=1-->
<!-- )s1-->
<!-- </if>-->
<!-- </select>-->
<select id="getColaCategoryAmountList" resultMap="CategoryAmountList">
<if test="equipTypeAmountPage.type == 'equipment' or codeHead==null or codeHead=='' or codeHead==' '">
select * from (
......@@ -739,6 +791,7 @@
</if>
order by createDate DESC
</select>
<select id="getFireFightingSystemDetail"
resultType="com.yeejoin.equipmanage.common.datasync.entity.FireFightingSystem">
SELECT
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment