Merge branch 'master' of http://111.203.232.171:8888/zhutianwei/data-acquisition

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/DataStatisticsController.java

@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @Api(tags = "数据统计")
 @RestController
-@RequestMapping("/business/t-processes-truck")
+@RequestMapping("/business/data-statistics")
 @Validated
 public class DataStatisticsController {
 

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/LoginController.java

@@ -46,7 +46,7 @@ public class LoginController {
     public R testSave() {
         //用户
         TSysUser user = new TSysUser();
-        user.setName("竹天卫").setLoginID("zhutianwei").setPassword("123456").setDeptID("1").setRoleID(1);
+        user.setName("竹天卫").setLoginID("zhutianwei"+userService.count()+1).setPassword("123456").setDeptID("1").setRoleID(1);
         Boolean ref = userService.save(user);
         Rcode.NOT_SQL.assertIsFalse(!ref);
         //设备台账

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TEquipmentAccountController.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -23,6 +24,7 @@ import org.springframework.web.bind.annotation.*;
 @Api(tags = "设备管理")
 @RestController
 @RequestMapping("/business/t-equipment-account")
+@Validated
 public class TEquipmentAccountController {
 
 	@Autowired

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TMaterialOutController.java

+package cn.wise.sc.acquisition.business.controller;
+
+
+import cn.wise.im.common.http.R;
+import cn.wise.sc.acquisition.business.model.PageQuery;
+import cn.wise.sc.acquisition.business.model.query.TEquipmentAccountQuery;
+import cn.wise.sc.acquisition.business.model.query.TMaterialOutQuery;
+import cn.wise.sc.acquisition.business.service.ITEquipmentAccountService;
+import cn.wise.sc.acquisition.business.service.ITMaterialOutService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author renchao
+ * @since 2021-04-27
+ */
+@Api(tags = "存货出库")
+@RestController
+@RequestMapping("/business/t-material-out")
+@Validated
+public class TMaterialOutController {
+
+	@Autowired
+	private ITMaterialOutService materialOutService;
+
+
+	@ApiOperation(value = "出库分页列表")
+	@GetMapping("/getPage")
+	public R getPage(PageQuery pageQuery) {
+		return materialOutService.getPage(pageQuery);
+	}
+
+	@ApiOperation(value = "领用出库")
+	@PostMapping("/delivery")
+	public R delivery(@RequestBody TMaterialOutQuery query) {
+		return materialOutService.delivery(query);
+	}
+
+
+	@ApiOperation(value = "修改领用出库")
+	@PostMapping("/update")
+	public R update(@RequestBody TMaterialOutQuery query) {
+		return materialOutService.update(query);
+	}
+
+
+	@ApiOperation(value = "领用出库详情")
+	@GetMapping("/getDetail/{Uid}")
+	public R getDetail(@PathVariable String Uid) {
+		return materialOutService.getDetail(Uid);
+	}
+
+
+
+
+
+
+}
+

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSafeTroubleController.java

+package cn.wise.sc.acquisition.business.controller;
+
+
+import cn.wise.im.common.http.R;
+import cn.wise.sc.acquisition.business.model.PageQuery;
+import cn.wise.sc.acquisition.business.model.query.TMaterialOutQuery;
+import cn.wise.sc.acquisition.business.model.query.TSafeTroubleQuery;
+import cn.wise.sc.acquisition.business.service.ITMaterialOutService;
+import cn.wise.sc.acquisition.business.service.ITSafeTroubleService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author renchao
+ * @since 2021-04-27
+ */
+@Api(tags = "安全台账")
+@RestController
+@RequestMapping("/business/t-safe-trouble")
+@Validated
+public class TSafeTroubleController {
+
+
+	@Autowired
+	private ITSafeTroubleService safeTroubleService;
+
+
+	@ApiOperation(value = "安全台账分页列表")
+	@GetMapping("/getPage")
+	public R getPage(PageQuery pageQuery) {
+		return safeTroubleService.getPage(pageQuery);
+	}
+
+	@ApiOperation(value = "添加隐患")
+	@PostMapping("/save")
+	public R save(@RequestBody TSafeTroubleQuery query, HttpServletRequest request) {
+		return safeTroubleService.save(query, request);
+	}
+
+	@ApiOperation(value = "隐患整改")
+	@PostMapping("/update")
+	public R update(@RequestBody TSafeTroubleQuery query, HttpServletRequest request) {
+		return safeTroubleService.update(query, request);
+	}
+
+	@ApiOperation(value = "隐患详情")
+	@GetMapping("/getDetail/{Uid}")
+	public R getDetail(@PathVariable String Uid) {
+		return safeTroubleService.getDetail(Uid);
+	}
+
+
+
+
+}
+

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TMaterialEntry.java

+package cn.wise.sc.acquisition.business.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author renchao
+ * @since 2021-04-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("T_Material_Entry")
+public class TMaterialEntry implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId("Uid")
+    private String Uid;
+
+    /**
+     * 材料类型，包括燃料及动力、润滑察试、配件、工具、火工材料、电力和其它等
+     */
+    @TableField("Type")
+    private String Type;
+
+    /**
+     * 本期购入的材料的品名
+     */
+    @TableField("Name")
+    private String Name;
+
+    /**
+     * 本期购入的数量
+     */
+    @TableField("Amount")
+    private Float Amount;
+
+    /**
+     * 本期购入的单价
+     */
+    @TableField("Price")
+    private Float Price;
+
+    /**
+     * 本期购入的金额：AmounMt*PriceM
+     */
+    @TableField("Total")
+    private Float Total;
+
+    /**
+     * 材料入库日期
+     */
+    @TableField("InDate")
+    private LocalDateTime InDate;
+
+    /**
+     * 材料入库人
+     */
+    @TableField("InPeopleName")
+    private String InPeopleName;
+
+
+}

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TMaterialOut.java

+package cn.wise.sc.acquisition.business.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author renchao
+ * @since 2021-04-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("T_Material_Out")
+public class TMaterialOut implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * ID号
+     */
+      @TableId("Uid")
+    private String Uid;
+
+    /**
+     * 设备编码
+     */
+    @TableField("EquipmentID")
+    private String EquipmentID;
+
+    /**
+     * 设备名称
+     */
+    @TableField("EquipmentName")
+    private String EquipmentName;
+
+    /**
+     * 工序名称
+     */
+    @TableField("ProcessesName")
+    private String ProcessesName;
+
+    /**
+     * 材料消耗的类型，包括燃料及动力、润滑察试、配件、工具、火工材料、电力和其它等
+     */
+    @TableField("ConsumeType")
+    private String ConsumeType;
+
+    /**
+     * 材料消耗日期
+     */
+    @TableField("ConsumeDate")
+    private LocalDateTime ConsumeDate;
+
+    /**
+     * 消耗材料的品名
+     */
+    @TableField("Name")
+    private String Name;
+
+    /**
+     * 消耗材料的数量
+     */
+    @TableField("Amount")
+    private Float Amount;
+
+    /**
+     * 消耗材料的单价
+     */
+    @TableField("Price")
+    private Float Price;
+
+    /**
+     * 花费的金额：Amount*Price
+     */
+    @TableField("Total")
+    private Float Total;
+
+    /**
+     * 用途:生产，保养、维修
+     */
+    @TableField("Purpose")
+    private String Purpose;
+
+    /**
+     * 材料发放人
+     */
+    @TableField("Clffr")
+    private String Clffr;
+
+    /**
+     * 材料领用人
+     */
+    @TableField("Cllyr")
+    private String Cllyr;
+
+    /**
+     * 备注
+     */
+    @TableField("Bz")
+    private String Bz;
+
+    /**
+     * 日期标记,如:2021年01月
+     */
+    @TableField("Tag")
+    private String Tag;
+
+
+}

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSafeTrouble.java

+package cn.wise.sc.acquisition.business.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author renchao
+ * @since 2021-04-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("T_Safe_Trouble")
+public class TSafeTrouble implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * ID号
+     */
+      @TableId("Uid")
+    private String Uid;
+
+    /**
+     * 检查人
+     */
+    @TableField("Jcr")
+    private String Jcr;
+
+    /**
+     * 发现日期
+     */
+    @TableField("Fxrq")
+    private LocalDateTime Fxrq;
+
+    /**
+     * 隐患位置
+     */
+    @TableField("Yhwz")
+    private String Yhwz;
+
+    /**
+     * 隐患描述
+     */
+    @TableField("Yhms")
+    private String Yhms;
+
+    /**
+     * 隐患级别
+     */
+    @TableField("Yhjb")
+    private String Yhjb;
+
+    /**
+     * 整改措施
+     */
+    @TableField("Zgcs")
+    private String Zgcs;
+
+    /**
+     * 整改要求
+     */
+    @TableField("Zgyq")
+    private String Zgyq;
+
+    /**
+     * 整改负责人
+     */
+    @TableField("Zgfzr")
+    private String Zgfzr;
+
+    /**
+     * 复查人
+     */
+    @TableField("Fcr")
+    private String Fcr;
+
+
+}

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSafeTroubleImg.java

+package cn.wise.sc.acquisition.business.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author renchao
+ * @since 2021-04-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("T_Safe_Trouble_Img")
+public class TSafeTroubleImg implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * T_Safe_Trouble中的ID
+     */
+    @TableField("TroubleUid")
+    private String TroubleUid;
+
+    /**
+     * 照片
+     */
+    @TableField("Img")
+    private byte[] Img;
+
+    /**
+     * 照片类型,分为隐患照片和整改后照片两类
+     */
+    @TableField("ImgType")
+    private String ImgType;
+
+
+
+    public interface ImgType{
+        String YH = "隐患照片";
+        String ZG = "整改照片";
+    }
+
+
+
+}

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TMaterialEntryMapper.java

+package cn.wise.sc.acquisition.business.mapper;
+
+import cn.wise.sc.acquisition.business.entity.TMaterialEntry;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author renchao
+ * @since 2021-04-27
+ */
+public interface TMaterialEntryMapper extends BaseMapper<TMaterialEntry> {
+
+}

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TMaterialOutMapper.java

+package cn.wise.sc.acquisition.business.mapper;
+
+import cn.wise.sc.acquisition.business.entity.TMaterialOut;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author renchao
+ * @since 2021-04-27
+ */
+public interface TMaterialOutMapper extends BaseMapper<TMaterialOut> {
+
+}

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TSafeTroubleImgMapper.java

+package cn.wise.sc.acquisition.business.mapper;
+
+import cn.wise.sc.acquisition.business.entity.TSafeTroubleImg;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author renchao
+ * @since 2021-04-27
+ */
+public interface TSafeTroubleImgMapper extends BaseMapper<TSafeTroubleImg> {
+
+}

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TSafeTroubleMapper.java

+package cn.wise.sc.acquisition.business.mapper;
+
+import cn.wise.sc.acquisition.business.entity.TSafeTrouble;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author renchao
+ * @since 2021-04-27
+ */
+public interface TSafeTroubleMapper extends BaseMapper<TSafeTrouble> {
+
+}

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TSysPowerMapper.java

@@ -3,6 +3,8 @@ package cn.wise.sc.acquisition.business.mapper;
 import cn.wise.sc.acquisition.business.entity.TSysPower;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -13,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface TSysPowerMapper extends BaseMapper<TSysPower> {
 
+	List<TSysPower> getPowerByRole(Integer roleId);
+
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TMaterialEntryMapper.xml

+<?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="cn.wise.sc.acquisition.business.mapper.TMaterialEntryMapper">
+
+</mapper>

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TMaterialOutMapper.xml

+<?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="cn.wise.sc.acquisition.business.mapper.TMaterialOutMapper">
+
+</mapper>

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TSafeTroubleImgMapper.xml

+<?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="cn.wise.sc.acquisition.business.mapper.TSafeTroubleImgMapper">
+
+</mapper>

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TSafeTroubleMapper.xml

+<?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="cn.wise.sc.acquisition.business.mapper.TSafeTroubleMapper">
+
+</mapper>

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TSysPowerMapper.xml

@@ -2,4 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.wise.sc.acquisition.business.mapper.TSysPowerMapper">
 
+    <select id="getPowerByRole" resultType="cn.wise.sc.acquisition.business.entity.TSysPower">
+        select p.*
+        from T_Sys_Power p
+        left join T_Sys_RolePower rp on rp.PowerID = p.ID
+        where rp.RoleID = #{params.roleId}
+    </select>
+
 </mapper>

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/LoginUser.java

 package cn.wise.sc.acquisition.business.model;
 
+import cn.wise.sc.acquisition.business.entity.TSysPower;
 import cn.wise.sc.acquisition.business.entity.TSysUser;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class LoginUser extends TSysUser {
 
-//	private List<SysPermission> permissions;
+
 	private String token;
 	/**
 	 * 登陆时间戳（毫秒）
@@ -17,8 +20,17 @@ public class LoginUser extends TSysUser {
 	 */
 	private Long expireTime;
 
-	private String postName;
-
-//	SysRole roleList;
+	/**
+	 * 角色
+	 */
+	private String roleName;
+	/**
+	 * 部门
+	 */
+	private String deptName;
+	/**
+	 * 功能
+	 */
+	private List<TSysPower> powerList;
 
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/SysUserEnclosureQuery.java

-package cn.wise.sc.acquisition.business.model.query;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @description: 人员管理附件
- * @author: wlb
- * @create: 2020-10-19
- **/
-@Data
-@ApiModel("人员管理附件")
-public class SysUserEnclosureQuery {
-    @ApiModelProperty("用户id")
-    private Integer userId;
-
-    @ApiModelProperty("文件名")
-    private String alias;
-
-    @ApiModelProperty("扩展名")
-    private String extName;
-
-    @ApiModelProperty("路径")
-    private String enclosureUrl;
-}

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TEquipmentAccountQuery.java

@@ -14,7 +14,7 @@ import java.time.LocalDateTime;
  * @since 2021-04-23
  */
 @Data
-@ApiModel("设备台账")
+@ApiModel("设备台账Query")
 public class TEquipmentAccountQuery {
 
 

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TMaterialOutQuery.java

+package cn.wise.sc.acquisition.business.model.query;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-04-27
+ */
+@Data
+@ApiModel("存货出库Query")
+public class TMaterialOutQuery {
+
+    /**
+     * ID号
+     */
+    @ApiModelProperty("出库表id")
+    private String uid;
+
+    /**
+     * 设备编码
+     */
+    @ApiModelProperty("设备编码")
+    private String equipmentID;
+
+    /**
+     * 设备名称
+     */
+    @ApiModelProperty("设备名称")
+    private String equipmentName;
+
+    /**
+     * 工序名称
+     */
+    @ApiModelProperty("工序名称")
+    private String processesName;
+
+    /**
+     * 材料消耗的类型，包括燃料及动力、润滑察试、配件、工具、火工材料、电力和其它等
+     */
+    @ApiModelProperty("材料消耗的类型，包括燃料及动力、润滑察试、配件、工具、火工材料、电力和其它等")
+    private String consumeType;
+
+    /**
+     * 材料消耗日期
+     */
+    @ApiModelProperty("材料消耗日期")
+    private LocalDateTime consumeDate;
+
+    /**
+     * 消耗材料的品名
+     */
+    @ApiModelProperty("消耗材料的品名")
+    private String name;
+
+    /**
+     * 消耗材料的数量
+     */
+    @ApiModelProperty("消耗材料的数量")
+    private Float amount;
+
+    /**
+     * 消耗材料的单价
+     */
+    @ApiModelProperty("消耗材料的单价")
+    private Float price;
+
+    /**
+     * 花费的金额：Amount*Price
+     */
+    @ApiModelProperty("花费的金额：Amount*Price")
+    private Float total;
+
+    /**
+     * 用途:生产，保养、维修
+     */
+    @ApiModelProperty("用途:生产，保养、维修")
+    private String purpose;
+
+    /**
+     * 材料发放人
+     */
+    @ApiModelProperty("材料发放人")
+    private String clffr;
+
+    /**
+     * 材料领用人
+     */
+    @ApiModelProperty("材料领用人")
+    private String cllyr;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    private String bz;
+
+    /**
+     * 日期标记,如:2021年01月
+     */
+    @ApiModelProperty("日期标记,如:2021年01月")
+    private String tag;
+
+
+}

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TSafeTroubleQuery.java

+package cn.wise.sc.acquisition.business.model.query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-04-27
+ */
+@Data
+@ApiModel("安全台账Query")
+public class TSafeTroubleQuery {
+
+
+    /**
+     * ID号
+     */
+    @ApiModelProperty("安全台账表id")
+    private String uid;
+
+    /**
+     * 检查人
+     */
+    @ApiModelProperty("检查人")
+    private String jcr;
+
+    /**
+     * 发现日期
+     */
+    @ApiModelProperty("发现日期")
+    private LocalDateTime fxrq;
+
+    /**
+     * 隐患位置
+     */
+    @ApiModelProperty("隐患位置")
+    private String yhwz;
+
+    /**
+     * 隐患描述
+     */
+    @ApiModelProperty("隐患描述")
+    private String yhms;
+
+    /**
+     * 隐患级别
+     */
+    @ApiModelProperty("隐患级别")
+    private String yhjb;
+
+    /**
+     * 整改措施
+     */
+    @ApiModelProperty("整改措施")
+    private String zgcs;
+
+    /**
+     * 整改要求
+     */
+    @ApiModelProperty("整改要求")
+    private String zgyq;
+
+    /**
+     * 整改负责人
+     */
+    @ApiModelProperty("整改负责人")
+    private String zgfzr;
+
+    /**
+     * 复查人
+     */
+    @ApiModelProperty("复查人")
+    private String fcr;
+
+
+/*    @ApiModelProperty("隐患照片")
+    private List<MultipartFile> photoList;*/
+
+
+
+
+}

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/vo/TSafeTroubleVo.java

+package cn.wise.sc.acquisition.business.model.vo;
+
+import cn.wise.sc.acquisition.business.entity.TSafeTroubleImg;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: ztw
+ * @create: 2021-04-25
+ **/
+@Data
+@ApiModel("安全台账Vo")
+public class TSafeTroubleVo {
+
+	/**
+	 * ID号
+	 */
+	@ApiModelProperty("Uid")
+	private String Uid;
+
+	/**
+	 * 检查人
+	 */
+	@ApiModelProperty("检查人")
+	private String Jcr;
+
+	/**
+	 * 发现日期
+	 */
+	@ApiModelProperty("发现日期")
+	private LocalDateTime Fxrq;
+
+	/**
+	 * 隐患位置
+	 */
+	@ApiModelProperty("隐患位置")
+	private String Yhwz;
+
+	/**
+	 * 隐患描述
+	 */
+	@ApiModelProperty("隐患描述")
+	private String Yhms;
+
+	/**
+	 * 隐患级别
+	 */
+	@ApiModelProperty("隐患级别")
+	private String Yhjb;
+
+	/**
+	 * 整改措施
+	 */
+	@ApiModelProperty("整改措施")
+	private String Zgcs;
+
+	/**
+	 * 整改要求
+	 */
+	@ApiModelProperty("整改要求")
+	private String Zgyq;
+
+	/**
+	 * 整改负责人
+	 */
+	@ApiModelProperty("整改负责人")
+	private String Zgfzr;
+
+	/**
+	 * 复查人
+	 */
+	@ApiModelProperty("复查人")
+	private String Fcr;
+
+
+	@ApiModelProperty("隐患照片")
+	List<TSafeTroubleImg> oldImgs = new ArrayList<>();
+
+	@ApiModelProperty("整改后照片")
+	List<TSafeTroubleImg> newImgs = new ArrayList<>();
+
+
+
+}

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITMaterialEntryService.java

+package cn.wise.sc.acquisition.business.service;
+
+import cn.wise.sc.acquisition.business.entity.TMaterialEntry;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author renchao
+ * @since 2021-04-27
+ */
+public interface ITMaterialEntryService extends IService<TMaterialEntry> {
+
+}

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITMaterialOutService.java

+package cn.wise.sc.acquisition.business.service;
+
+import cn.wise.im.common.http.R;
+import cn.wise.sc.acquisition.business.entity.TMaterialOut;
+import cn.wise.sc.acquisition.business.model.PageQuery;
+import cn.wise.sc.acquisition.business.model.query.TMaterialOutQuery;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author renchao
+ * @since 2021-04-27
+ */
+public interface ITMaterialOutService extends IService<TMaterialOut> {
+
+	R<IPage<TMaterialOut>> getPage(PageQuery pageQuery);
+
+	R delivery(TMaterialOutQuery query);
+
+	R update(TMaterialOutQuery query);
+
+	R<TMaterialOut> getDetail(String Uid);
+
+
+}

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSafeTroubleImgService.java

+package cn.wise.sc.acquisition.business.service;
+
+import cn.wise.sc.acquisition.business.entity.TSafeTroubleImg;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author renchao
+ * @since 2021-04-27
+ */
+public interface ITSafeTroubleImgService extends IService<TSafeTroubleImg> {
+
+}

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSafeTroubleService.java

+package cn.wise.sc.acquisition.business.service;
+
+import cn.wise.im.common.http.R;
+import cn.wise.sc.acquisition.business.entity.TSafeTrouble;
+import cn.wise.sc.acquisition.business.model.PageQuery;
+import cn.wise.sc.acquisition.business.model.query.TSafeTroubleQuery;
+import cn.wise.sc.acquisition.business.model.vo.TSafeTroubleVo;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author renchao
+ * @since 2021-04-27
+ */
+public interface ITSafeTroubleService extends IService<TSafeTrouble> {
+
+	R<IPage<TSafeTrouble>> getPage(PageQuery pageQuery);
+
+	R save(TSafeTroubleQuery query, HttpServletRequest request);
+
+	R update(TSafeTroubleQuery query,HttpServletRequest request);
+
+	R<TSafeTroubleVo> getDetail(String Uid);
+
+
+
+
+
+
+
+
+}

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TMaterialEntryServiceImpl.java

+package cn.wise.sc.acquisition.business.service.impl;
+
+import cn.wise.sc.acquisition.business.entity.TMaterialEntry;
+import cn.wise.sc.acquisition.business.mapper.TMaterialEntryMapper;
+import cn.wise.sc.acquisition.business.service.ITMaterialEntryService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author renchao
+ * @since 2021-04-27
+ */
+@Service
+public class TMaterialEntryServiceImpl extends ServiceImpl<TMaterialEntryMapper, TMaterialEntry> implements ITMaterialEntryService {
+
+}

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TMaterialOutServiceImpl.java

+package cn.wise.sc.acquisition.business.service.impl;
+
+import cn.wise.im.common.http.R;
+import cn.wise.sc.acquisition.business.constant.Rcode;
+import cn.wise.sc.acquisition.business.entity.TEquipmentAccount;
+import cn.wise.sc.acquisition.business.entity.TMaterialOut;
+import cn.wise.sc.acquisition.business.entity.TSafeTrouble;
+import cn.wise.sc.acquisition.business.entity.TSafeTroubleImg;
+import cn.wise.sc.acquisition.business.mapper.TMaterialOutMapper;
+import cn.wise.sc.acquisition.business.model.PageQuery;
+import cn.wise.sc.acquisition.business.model.query.TEquipmentAccountQuery;
+import cn.wise.sc.acquisition.business.model.query.TMaterialOutQuery;
+import cn.wise.sc.acquisition.business.model.vo.TSafeTroubleVo;
+import cn.wise.sc.acquisition.business.service.ITMaterialOutService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author renchao
+ * @since 2021-04-27
+ */
+@Service
+@Transactional
+public class TMaterialOutServiceImpl extends ServiceImpl<TMaterialOutMapper, TMaterialOut> implements ITMaterialOutService {
+
+	@Resource
+	private TMaterialOutMapper materialOutMapper;
+
+	/**
+	 * 分页列表
+	 * @param pageQuery
+	 * @return
+	 */
+	@Override
+	public R<IPage<TMaterialOut>> getPage(PageQuery pageQuery) {
+		QueryWrapper<TMaterialOut> qw = new QueryWrapper<>();
+		qw.orderByDesc("Tag");
+		IPage<TMaterialOut> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
+		page = materialOutMapper.selectPage(page, qw);
+		return R.ok(page);
+	}
+
+	/**
+	 * 领用出库
+	 * @param query
+	 * @return
+	 */
+	@Override
+	public R delivery(TMaterialOutQuery query) {
+		Rcode.NOT_PARAM.assertNotNull(query);
+		Rcode.NOT_PARAM.assertNotNull(query.getEquipmentID());
+		Rcode.NOT_PARAM.assertNotNull(query.getEquipmentName());
+		TMaterialOut out = new TMaterialOut();
+		BeanUtils.copyProperties(query, out);
+		materialOutMapper.insert(out);
+		return R.ok();
+	}
+
+	/**
+	 * 修改领用出库
+	 * @param query
+	 * @return
+	 */
+	@Override
+	public R update(TMaterialOutQuery query) {
+		Rcode.NOT_PARAM.assertNotNull(query);
+		Rcode.NOT_PARAM.assertNotNull(query.getEquipmentID());
+		Rcode.NOT_PARAM.assertNotNull(query.getEquipmentName());
+		TMaterialOut out = materialOutMapper.selectById(query.getUid());
+		Rcode.NOT_FOUND.assertNotNull(out);
+		BeanUtils.copyProperties(query, out);
+		materialOutMapper.updateById(out);
+		return R.ok();
+	}
+
+	/**
+	 * 领用出库详情
+	 * @param Uid
+	 * @return
+	 */
+	@Override
+	public R<TMaterialOut> getDetail(String Uid) {
+		Rcode.NOT_PARAM.assertNotNull(Uid);
+		TMaterialOut out = materialOutMapper.selectById(Uid);
+		Rcode.NOT_FOUND.assertNotNull(out);
+		return R.ok(out);
+	}
+
+}

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSafeTroubleImgServiceImpl.java

+package cn.wise.sc.acquisition.business.service.impl;
+
+import cn.wise.sc.acquisition.business.entity.TSafeTroubleImg;
+import cn.wise.sc.acquisition.business.mapper.TSafeTroubleImgMapper;
+import cn.wise.sc.acquisition.business.service.ITSafeTroubleImgService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author renchao
+ * @since 2021-04-27
+ */
+@Service
+public class TSafeTroubleImgServiceImpl extends ServiceImpl<TSafeTroubleImgMapper, TSafeTroubleImg> implements ITSafeTroubleImgService {
+
+}

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSafeTroubleServiceImpl.java

+package cn.wise.sc.acquisition.business.service.impl;
+
+import cn.wise.im.common.http.R;
+import cn.wise.sc.acquisition.business.constant.Rcode;
+import cn.wise.sc.acquisition.business.entity.*;
+import cn.wise.sc.acquisition.business.enumation.FileExt;
+import cn.wise.sc.acquisition.business.mapper.TSafeTroubleImgMapper;
+import cn.wise.sc.acquisition.business.mapper.TSafeTroubleMapper;
+import cn.wise.sc.acquisition.business.model.LoginUser;
+import cn.wise.sc.acquisition.business.model.PageQuery;
+import cn.wise.sc.acquisition.business.model.query.TMaterialOutQuery;
+import cn.wise.sc.acquisition.business.model.query.TSafeTroubleQuery;
+import cn.wise.sc.acquisition.business.model.vo.TSafeTroubleVo;
+import cn.wise.sc.acquisition.business.service.ITSafeTroubleService;
+import cn.wise.sc.acquisition.business.util.ImageUtil;
+import cn.wise.sc.acquisition.business.util.dfs.FastDFSUtils;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author renchao
+ * @since 2021-04-27
+ */
+@Service
+@Transactional
+public class TSafeTroubleServiceImpl extends ServiceImpl<TSafeTroubleMapper, TSafeTrouble> implements ITSafeTroubleService {
+
+	@Resource
+	private TSafeTroubleMapper safeTroubleMapper;
+	@Resource
+	private TSafeTroubleImgMapper safeTroubleImgMapper;
+
+	/**
+	 * 安全台账分页
+	 * @param pageQuery
+	 * @return
+	 */
+	@Override
+	public R<IPage<TSafeTrouble>> getPage(PageQuery pageQuery) {
+		QueryWrapper<TSafeTrouble> qw = new QueryWrapper<>();
+		qw.orderByDesc("Fxrq");
+		IPage<TSafeTrouble> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
+		page = safeTroubleMapper.selectPage(page, qw);
+		return R.ok(page);
+	}
+
+
+	/**
+	 * 添加隐患
+	 * @param query
+	 * @return
+	 */
+	@Override
+	public R save(TSafeTroubleQuery query, HttpServletRequest request) {
+		Rcode.NOT_PARAM.assertNotNull(query);
+		TSafeTrouble safeTrouble = new TSafeTrouble();
+		BeanUtils.copyProperties(query, safeTrouble);
+		safeTroubleMapper.insert(safeTrouble);
+
+		//保存隐患图片
+		List<MultipartFile> photos = ((MultipartHttpServletRequest) request).getFiles("photos");
+		return saveImg(TSafeTroubleImg.ImgType.YH, safeTrouble.getUid(),  photos);
+	}
+
+
+	/**
+	 * 隐患整改
+	 * @param query
+	 * @return
+	 */
+	@Override
+	public R update(TSafeTroubleQuery query,HttpServletRequest request) {
+		Rcode.NOT_PARAM.assertNotNull(query);
+		Rcode.NOT_PARAM.assertNotNull(query.getUid());
+		TSafeTrouble safeTrouble = safeTroubleMapper.selectById(query.getUid());
+		Rcode.NOT_FOUND.assertNotNull(safeTrouble);
+		BeanUtils.copyProperties(query, safeTrouble);
+		safeTroubleMapper.updateById(safeTrouble);
+
+		//保存隐患图片
+		List<MultipartFile> photos = ((MultipartHttpServletRequest) request).getFiles("photos");
+		return saveImg(TSafeTroubleImg.ImgType.ZG, safeTrouble.getUid(),  photos);
+	}
+
+
+	/**
+	 * 保存隐患图片信息
+	 * @param imgType 隐患图片类型 ,分为隐患照片和整改后照片两类
+	 * @param Uid   隐患表id
+	 * @param photos  相片列表
+	 * @return
+	 */
+	private R saveImg(String imgType, String Uid, List<MultipartFile> photos){
+		if (photos != null && photos.size() > 0) {
+			for (MultipartFile file : photos) {
+				boolean ref = ImageUtil.checkFileSize( file.getSize(),30,"M");
+				if(!ref){
+					return R.fail(400, "文件不能大于30M");
+				}
+				TSafeTroubleImg safeTroubleImg = new TSafeTroubleImg();
+				safeTroubleImg.setTroubleUid(Uid)
+						.setImg(ImageUtil.transformByte(file))
+						.setImgType(imgType);
+				safeTroubleImgMapper.insert(safeTroubleImg);
+			}
+		}
+		return R.ok();
+	}
+
+	/**
+	 * 隐患详情
+	 * @param Uid
+	 * @return
+	 */
+	@Override
+	public R<TSafeTroubleVo> getDetail(String Uid) {
+		Rcode.NOT_PARAM.assertNotNull(Uid);
+
+		TSafeTrouble safeTrouble = safeTroubleMapper.selectById(Uid);
+		Rcode.NOT_FOUND.assertNotNull(safeTrouble);
+		TSafeTroubleVo safeTroubleVo = new TSafeTroubleVo();
+		BeanUtils.copyProperties(safeTrouble, safeTroubleVo);
+
+		QueryWrapper<TSafeTroubleImg> imgWrapper = new QueryWrapper<>();
+		imgWrapper.eq("TroubleUid", safeTroubleVo.getUid());
+		List<TSafeTroubleImg> checkList = safeTroubleImgMapper.selectList(imgWrapper);
+		//整改前照片
+		List<TSafeTroubleImg> oldImgs =  checkList.stream()
+				.filter(arg -> arg.getImgType().equals(TSafeTroubleImg.ImgType.YH)).collect(Collectors.toList());
+		safeTroubleVo.setOldImgs(oldImgs);
+		//整改后照片
+		List<TSafeTroubleImg> newImgs =  checkList.stream()
+				.filter(arg -> arg.getImgType().equals(TSafeTroubleImg.ImgType.ZG)).collect(Collectors.toList());
+		safeTroubleVo.setNewImgs(newImgs);
+
+
+		return R.ok(safeTroubleVo);
+	}
+
+
+
+
+
+}

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSysUserServiceImpl.java

@@ -2,12 +2,16 @@ package cn.wise.sc.acquisition.business.service.impl;
 
 import cn.wise.im.common.http.R;
 import cn.wise.sc.acquisition.business.constant.Rcode;
-import cn.wise.sc.acquisition.business.entity.TSysUser;
+import cn.wise.sc.acquisition.business.entity.*;
+import cn.wise.sc.acquisition.business.mapper.TSysDeptMapper;
+import cn.wise.sc.acquisition.business.mapper.TSysPowerMapper;
+import cn.wise.sc.acquisition.business.mapper.TSysRoleMapper;
 import cn.wise.sc.acquisition.business.mapper.TSysUserMapper;
 import cn.wise.sc.acquisition.business.model.LoginUser;
 import cn.wise.sc.acquisition.business.service.ITSysUserService;
 import cn.wise.sc.acquisition.business.util.JwtUtil;
 import cn.wise.sc.acquisition.business.util.RedisUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +19,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -30,6 +35,15 @@ public class TSysUserServiceImpl extends ServiceImpl<TSysUserMapper, TSysUser> i
 
 	@Resource
 	private TSysUserMapper userMapper;
+
+	@Resource
+	private TSysRoleMapper roleMapper;
+	@Resource
+	private TSysDeptMapper deptMapper;
+	@Resource
+	private TSysPowerMapper powerMapper;
+
+
 	@Resource
 	private HttpServletRequest request;
 	@Autowired
@@ -56,8 +70,18 @@ public class TSysUserServiceImpl extends ServiceImpl<TSysUserMapper, TSysUser> i
 		TSysUser sysUser = userMapper.selectById(Integer.valueOf(map.get("id").toString()));
 		LoginUser loginUser = new LoginUser();
 		BeanUtils.copyProperties(sysUser, loginUser);
+		//角色
+		TSysRole role = roleMapper.selectById(sysUser.getRoleID());
+		Rcode.NOT_FOUND.assertNotNull(role);
+		loginUser.setRoleName(role.getName());
+		//部门
+		TSysDept dept = deptMapper.selectById(sysUser.getDeptID());
+		Rcode.NOT_FOUND.assertNotNull(dept);
+		loginUser.setDeptName(dept.getName());
+		//功能权限
+		List<TSysPower> powerList = powerMapper.getPowerByRole(role.getId());
+		loginUser.setPowerList(powerList);
 		return R.ok(loginUser);
-
 	}
 
 

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/util/ImageUtil.java

@@ -192,4 +192,46 @@ public class ImageUtil {
         //String encode = Base64.encode(stream.toByteArray());
         return stream.toByteArray();
     }
+
+
+
+    /**
+     * 判断图片大小
+     *
+     * @param len
+     *            文件长度
+     * @param size
+     *            限制大小
+     * @param unit
+     *            限制单位（B,K,M,G）
+     * @return
+     */
+    public static boolean checkFileSize(Long len, int size, String unit) {
+//        long len = file.length();
+        double fileSize = 0;
+        if ("B".equals(unit.toUpperCase())) {
+            fileSize = (double) len;
+        } else if ("K".equals(unit.toUpperCase())) {
+            fileSize = (double) len / 1024;
+        } else if ("M".equals(unit.toUpperCase())) {
+            fileSize = (double) len / 1048576;
+        } else if ("G".equals(unit.toUpperCase())) {
+            fileSize = (double) len / 1073741824;
+        }
+        if (fileSize > size) {
+            return false;
+        }
+        return true;
+    }
+
+
+
+
+
+
+
+
+
+
 }
+