修改model

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/Equipment.java

 package com.yeejoin.equipmanage.common.entity;
 
-import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.equipmanage.common.entity.publics.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -29,55 +27,25 @@ public class Equipment extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "装备名称")
-    @TableField("name")
     private String name;
 
     @ApiModelProperty(value = "装备编码")
-    @TableField("code")
     private String code;
 
     @ApiModelProperty(value = "装备分类id")
-    @TableField("category_id")
     private Long categoryId;
 
-    @ApiModelProperty(value = "装备型号")
-    @TableField("country")
+    @ApiModelProperty(value = "国别")
     private String country;
 
-    @ApiModelProperty(value = "存放位置")
-    @TableField("area")
-    private String area;
-
-    @ApiModelProperty(value = "生产厂家")
-    @TableField("made_in")
-    private String madeIn;
-
-
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @TableField("open_time")
-    @ApiModelProperty(value = "出厂时间")
-    private Date openTime;
-
-
-    @ApiModelProperty(value = "工作时间")
-    @TableField("remark")
-    private String remark;
-
-    @ApiModelProperty(value = "所属单位")
-    @TableField("company_name")
-    private String companyName;
-
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @TableField("join_time")
-    @ApiModelProperty(value = "入库时间")
-    private Date joinTime;
-
     @ApiModelProperty(value = "保养周期")
     private Short maintenanceCycle;
 
     @ApiModelProperty(value = "检查周期（天）")
     private Short checkCycle;
 
+    private String remark;
+
     @ApiModelProperty(value = "管理方式 单件还是批量管理模式，单件S，批量：P")
     private Long managementStyle;
 
@@ -94,6 +62,9 @@ public class Equipment extends BaseEntity {
     @TableField(exist = false)
     private Unit unit;
 
+    @ApiModelProperty(value = "生产源地 0国产1进口9其他")
+    private String madeIn;
+
     @ApiModelProperty(value = "生产厂家")
     private String manufacturer;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentDetail.java

@@ -4,7 +4,6 @@ import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
-import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -33,64 +32,12 @@ public class EquipmentDetail extends BaseEntity {
 
 	@TableField("name")
 	@ApiModelProperty(value = "名称")
-	@Excel(name = "名称", orderNum = "1")
 	private String name;
 
 	@TableField("code")
 	@ApiModelProperty(value = "编码")
-	@Excel(name = "编码", orderNum = "2")
 	private String code;
 
-
-	@TableField("remark")
-	@ApiModelProperty(value = "生产厂家")
-	@Excel(name = "生产厂家", orderNum = "3")
-	private String remark;
-
-	@TableField("manufacturer_id")
-	@ApiModelProperty(value = "所属分系统id")
-	@Excel(name = "所属分系统id", orderNum = "4")
-	private Long manufacturerId;
-
-	@TableField("supplier_id")
-	@ApiModelProperty(value = "工作时间")
-	//@Excel(name = "工作时间", orderNum = "5")
-	private String supplierId;
-
-	@TableField("standard")
-	@ApiModelProperty(value = "部件型号")
-	@Excel(name = "部件型号", orderNum = "6")
-	private String standard;
-
-	@TableField("brand")
-	@ApiModelProperty(value = "所属单位")
-	@Excel(name = "所属单位", orderNum = "7")
-	private String brand;
-
-	@JsonFormat(pattern = "yyyy-MM-dd")
-	@TableField("production_date")
-	@ApiModelProperty(value = "出厂日期")
-	//@Excel(name = "出厂日期", orderNum = "8")
-	private Date productionDate;
-
-	@JsonFormat(pattern = "yyyy-MM-dd")
-	@TableField("update_date")
-	@ApiModelProperty(value = "入库时间")
-//	@Excel(name = "入库时间", orderNum = "9")
-	private Date updateDate;
-
-	@TableField("area")
-	@ApiModelProperty(value = "存放位置")
-	@Excel(name = "存放位置", orderNum = "10")
-	private String area;
-
-	@TableField("agent")
-	@ApiModelProperty(value = "代理商")
-	private String agent;
-
-	@TableField("creator_id")
-	@ApiModelProperty(value = "创建人id")
-	private Long creatorId;
 	@TableField("equipment_id")
 	@ApiModelProperty(value = "装备定义id")
 	private Long equipmentId;
@@ -99,28 +46,49 @@ public class EquipmentDetail extends BaseEntity {
 	@ApiModelProperty(value = "装备定义名称")
 	private String equipmentName;
 
-
-	@TableField("maintenance_cycle")
-	@ApiModelProperty(value = "保养周期")
-	private BigDecimal maintenanceCycle;
-
 	@TableField(exist = false)
 	private Equipment equipment;
 
 	@TableField(exist = false)
 	private String categoryName;
 
+
+
+	@TableField("creator_id")
+	@ApiModelProperty(value = "创建人id")
+	private Long creatorId;
+
+	@TableField("manufacturer_id")
+	@ApiModelProperty(value = "生产厂商id")
+	private Long manufacturerId;
+
 	@TableField(exist = false)
 	private String manufacturerName;
 
 	@TableField(exist = false)
 	private ManufacturerInfo manufacturerInfo;
 
+
+
+
+
+	@TableField("update_date")
+	@ApiModelProperty(value = "更新时间")
+	private Date updateDate;
+
+	@TableField("agent")
+	@ApiModelProperty(value = "代理商")
+	private String agent;
+
+
+
 	@TableField("contract_code")
 	@ApiModelProperty(value = "合同编号")
 	private String contractCode;
 
-
+	@TableField("production_date")
+	@ApiModelProperty(value = "生产日期")
+	private Date productionDate;
 
 	@TableField("perf_quota_str")
 	@ApiModelProperty(value = "核心参数")
@@ -142,6 +110,10 @@ public class EquipmentDetail extends BaseEntity {
 	@ApiModelProperty(value = "是否进口")
 	private Boolean isImport;
 
+	@TableField("supplier_id")
+	@ApiModelProperty(value = "供应商id")
+	private String supplierId;
+
 	@TableField(exist = false)
 	private List<UploadFile> img;
 
@@ -181,4 +153,40 @@ public class EquipmentDetail extends BaseEntity {
 
 
 
+	@TableField("eq_code")
+	@ApiModelProperty(value = "部件编码")
+	private String eqcode;
+
+	@TableField("standard")
+	@ApiModelProperty(value = "部件型号")
+	private String standard;
+
+
+	@TableField("area")
+	@ApiModelProperty(value = "存放位置")
+	private String area;
+
+	@TableField("brand")
+	@ApiModelProperty(value = "生产厂家")
+	private String brand;
+
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	@TableField("open_date")
+	@ApiModelProperty(value = "出厂时间")
+	private Date openDate;
+
+	@TableField("maintenance_cycle")
+	@ApiModelProperty(value = "工作时间")
+	private BigDecimal maintenanceCycle;
+
+
+	@TableField("remark")
+	@ApiModelProperty(value = "所属单位")
+	private String remark;
+
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	@TableField("join_date")
+	@ApiModelProperty(value = "入库时间")
+	private Date joinDate;
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentCategoryController.java

@@ -49,6 +49,7 @@ import com.yeejoin.equipmanage.service.IIndustryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import sun.rmi.runtime.Log;
 
 /**
  * 装备分类
@@ -80,11 +81,11 @@ public class EquipmentCategoryController extends AbstractBaseController {
 
 	/**
 	 * 新增装备分类
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/save", method = RequestMethod.POST)
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@TycloudOperation( ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "POST", value = "新增装备分类", notes = "新增装备分类")
 	public EquipmentCategory saveEquipmentCategory(HttpServletRequest request,
 			@RequestBody EquipmentCategory equipmentCategory) {
@@ -95,7 +96,7 @@ public class EquipmentCategoryController extends AbstractBaseController {
 
 	/**
 	 * 根据id删除
-	 * 
+	 *
 	 * @param ids
 	 * @return
 	 */
@@ -144,7 +145,7 @@ public class EquipmentCategoryController extends AbstractBaseController {
 
 	/**
 	 * 修改装备分类
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/updateById", method = RequestMethod.PUT)
@@ -164,7 +165,7 @@ public class EquipmentCategoryController extends AbstractBaseController {
 
 	/**
 	 * 根据id查询
-	 * 
+	 *
 	 * @param id
 	 * @return
 	 */
@@ -177,7 +178,7 @@ public class EquipmentCategoryController extends AbstractBaseController {
 
 	/**
 	 * 列表分页查询
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/list", method = RequestMethod.GET)
@@ -224,7 +225,7 @@ public class EquipmentCategoryController extends AbstractBaseController {
 
 	/**
 	 * 全量数据树形结构返回
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/list-tree", method = RequestMethod.GET)
@@ -255,7 +256,7 @@ public class EquipmentCategoryController extends AbstractBaseController {
 	}
 
 	/**
-	 * 
+	 *
 	 * 获取子节点
 	 **/
 	private void getChildren(List<EquipmentCategory> list, Map<String, List<EquipmentCategory>> tmpMap) {
@@ -272,7 +273,7 @@ public class EquipmentCategoryController extends AbstractBaseController {
 
 	/**
 	 * 全量数据树形结构返回
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/tree/{type}", method = RequestMethod.GET)
@@ -356,7 +357,7 @@ public class EquipmentCategoryController extends AbstractBaseController {
 
 	/**
 	 * 数据库读取装备树
-	 * 
+	 *
 	 * @return
 	 */
 	public List<IndustryVo> getTreeList() {
@@ -374,26 +375,27 @@ 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;
 	}
 
 	public List<EquipmentCategory> getIndustryTreeList(String code) {
 		List<EquipmentCategory> list = this.iEquipmentCategoryService.getIndustryTreeList(code);
+
 		return list;
 	}
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentDetailController.java

@@ -114,8 +114,10 @@ public class EquipmentDetailController extends AbstractBaseController {
     @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
     public EquipmentDate saveEquipmentDetail(@RequestBody EquipmentDate equipmentDate) {
 
-        Long aLong = new Long(1481071111);
-        equipmentDate.getEquipmentDetail().setEquipmentId(aLong);
+
+
+//        Long aLong = new Long("1481079154903384065");
+//        equipmentDate.getEquipmentDetail().setEquipmentId(aLong);
         EquipmentSpecific  vo = equipmentDate.getEquipmentSpecific();
         String sysCode = vo.getCode();
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentCategoryServiceImpl.java

@@ -173,7 +173,7 @@ public class EquipmentCategoryServiceImpl extends ServiceImpl<EquipmentCategoryM
 
     @Override
     public List<EquipmentCategory> tree(String type) {
-//        this.getEquipmentCategoryList(Integer.valueOf(2));
+        this.getEquipmentCategoryList(Integer.valueOf(2));
         List<EquipmentCategory> list = null;
 
         // 判断缓存中是否有该数据
@@ -362,6 +362,7 @@ public class EquipmentCategoryServiceImpl extends ServiceImpl<EquipmentCategoryM
         List<EquipmentCategory> trees = new ArrayList<EquipmentCategory>();
         for (EquipmentCategory treeNode : treeNodes) {
             if (null == treeNode.getParentId()) {
+
                 trees.add(findChildren(treeNode, treeNodes));
             }
         }
@@ -378,6 +379,7 @@ public class EquipmentCategoryServiceImpl extends ServiceImpl<EquipmentCategoryM
         for (EquipmentCategory it : treeNodes) {
             if (treeNode.getId().equals(it.getParentId())) {
                 if (treeNode.getChildren() == null) {
+
                     treeNode.setChildren(new ArrayList<EquipmentCategory>());
                 }
                 treeNode.getChildren().add(findChildren(it, treeNodes));

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentDetailServiceImpl.java

@@ -70,11 +70,11 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
 
     @Override
     public EquipmentDetail saveOne(EquipmentDetail equipmentDetail) {
-//        Equipment equipment = equipmentMapper.selectById(equipmentDetail.getEquipmentId());
-//        equipmentDetail.setCode(equipment.getCode());
+        Equipment equipment = equipmentMapper.selectById(equipmentDetail.getEquipmentId());
+        equipmentDetail.setCode(equipment.getCode());
         equipmentDetail.setEquipmentId(equipmentDetail.getEquipmentId());
         this.save(equipmentDetail);
-//        saveFile(equipmentDetail);
+        saveFile(equipmentDetail);
         return equipmentDetail;
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java

@@ -1173,9 +1173,10 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
         EquipmentDetail equipmentDetail = equipmentData.getEquipmentDetail();
         Equipment equipment = equipmentService.getById(equipmentDetail.getEquipmentId());
         if (equipment != null) {
-            equipmentDetail.setCode(equipmentDetail.getCode());
-            equipmentDetail.setEquipmentName(equipmentDetail.getName());
-            equipmentSpecific.setEquipmentCode(equipmentDetail.getCode());
+            String equipmentCode = equipment.getCode();
+            equipmentDetail.setCode(equipmentCode);
+            equipmentDetail.setEquipmentName(equipment.getName());
+            equipmentSpecific.setEquipmentCode(equipmentCode);
             equipmentSpecific.setName(equipmentDetail.getName());
         }
         Long warehouseStructureId = null;

amos-boot-system-equip/src/main/resources/application-dev.properties

 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url = jdbc:mysql://172.16.3.18:3306/business_v3.0.0.2?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+spring.datasource.url = jdbc:mysql://192.168.1.114:3306/business_v3.0.0.2?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
 spring.datasource.username=root
 spring.datasource.password=Yeejoin@2020
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource
@@ -12,7 +12,7 @@ spring.datasource.hikari.max-lifetime= 1800000
 spring.datasource.hikari.connection-timeout= 60000
 spring.datasource.hikari.connection-test-query= SELECT 1
 
-eureka.instance.hostname= 172.16.3.18
+eureka.instance.hostname= 192.168.1.114
 eureka.instance.prefer-ip-address = true
 eureka.client.serviceUrl.defaultZone: http://${eureka.instance.hostname}:10001/eureka/
 
@@ -25,9 +25,9 @@ security.appKeyApp=studio_normalapp_3056965
 
 #redis
 spring.redis.database=1
-spring.redis.host=172.16.3.18
+spring.redis.host=192.168.1.114
 spring.redis.port=6379
-spring.redis.password=yeejoin@2020
+spring.redis.password=1234560
 spring.redis.lettuce.pool.max-active=200
 spring.redis.lettuce.pool.max-wait=-1
 spring.redis.lettuce.pool.max-idle=10
@@ -37,10 +37,10 @@ spring.redis.expire.time=300
 ## emqx
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
-emqx.broker=tcp://172.16.3.156:2883
+emqx.broker=tcp://192.168.1.114:2883
 emqx.user-name=admin
 emqx.password=public
-mqtt.scene.host=mqtt://172.16.3.156:18083/mqtt
+mqtt.scene.host=mqtt://192.168.1.114:18083/mqtt
 mqtt.client.product.id=mqtt
 mqtt.topic=topic_mqtt
 spring.mqtt.completionTimeout=3000