2021/6/23 转栏管理修改&转栏记录查询

huimv-smart-datacollection/src/main/java/com/huimv/datacollection/HuimvSmartDatacollectionApplication.java

@@ -4,6 +4,11 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 
+/**
+ * @author yinhao
+ * @version 1.0
+ * @date 2021/6/23
+ */
 @SpringBootApplication
 public class HuimvSmartDatacollectionApplication {
 

huimv-smart-management/src/main/java/com/huimv/management/Abc.java

@@ -82,5 +82,25 @@ public class Abc {
 //        System.out.println(date);
 
 //        GetUserUtil.getUser(null);
+
+
+        int floor = 6;
+
+        for (int i = 1; i <= floor; i++) {
+
+            for (int k = 1; k <= floor - i; k++) {
+                System.out.print(" ");
+            }
+
+            for (int j = 1; j <= 2 * i - 1; j++) {
+                if (j == 1 || j == 2 * i - 1 || i == floor) {
+                    System.out.print("*");
+                } else {
+                    System.out.print(" ");
+                }
+            }
+
+            System.out.println();
+        }
     }
 }

huimv-smart-management/src/main/java/com/huimv/management/HuimvSmartManagementApplication.java

@@ -9,6 +9,7 @@ import org.springframework.web.client.RestTemplate;
 
 /**
  * @author yinhao
+ * @version 1.0
  * @since 2021/5/31 15:44
  */
 @SpringBootApplication

huimv-smart-management/src/main/java/com/huimv/management/controller/TransferPeriodLogController.java

@@ -21,7 +21,7 @@ import com.huimv.common.utils.R;
  * 转栏记录表
  *
  * @author yinhao
- * @email yinhao@163.com
+ * @version 1.0
  * @date 2021-06-18 18:18:52
  */
 @RestController

huimv-smart-management/src/main/java/com/huimv/management/controller/UnitController.java

@@ -22,7 +22,7 @@ import com.huimv.common.utils.R;
  * 单元信息表
  *
  * @author yinhao
- * @email yinhao@163.com
+ * @version 1.0
  * @date 2021-05-07 15:32:42
  */
 @Api(tags = "单元信息表")

huimv-smart-management/src/main/java/com/huimv/management/dao/TransferPeriodLogDao.java

@@ -1,8 +1,12 @@
 package com.huimv.management.dao;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huimv.management.entity.TransferPeriodLogEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.management.entity.vo.TransferPeriodLogVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -11,12 +15,24 @@ import java.util.List;
  * 转栏记录表
  * 
  * @author yinhao
- * @email yinhao@163.com
+ * @version 1.0@
  * @date 2021-06-18 18:18:52
  */
 @Mapper
 @Repository
 public interface TransferPeriodLogDao extends BaseMapper<TransferPeriodLogEntity> {
 
+    /**
+     * 批量新增
+     * @param logEntityList
+     */
     void batchInsert(List<TransferPeriodLogEntity> logEntityList);
+
+    /**
+     * 分页条件构造查询
+     * @param page
+     * @param queryWrapper
+     * @return
+     */
+    IPage<TransferPeriodLogVo> page(@Param("page") IPage page, @Param("ew") QueryWrapper<TransferPeriodLogVo> queryWrapper);
 }

huimv-smart-management/src/main/java/com/huimv/management/entity/TransferPeriodLogEntity.java

@@ -13,7 +13,7 @@ import lombok.Data;
  * 转栏记录表
  * 
  * @author yinhao
- * @email yinhao@163.com
+ * @version 1.0
  * @date 2021-06-18 18:18:52
  */
 @Data
@@ -31,25 +31,37 @@ public class TransferPeriodLogEntity implements Serializable {
 	 */
 	private Integer farmId;
 	/**
-	 * 耳标
+	 * 猪id
+	 */
+	private Integer pigId;
+	/**
+	 * 猪耳标
 	 */
 	private String earTag;
 	/**
-	 * 旧栏期
+	 * 旧猪舍
 	 */
-	private String oldPeriod;
+	private Integer oldPigstyId;
 	/**
-	 * 新栏期
+	 * 新猪舍
 	 */
-	private String newPeriod;
+	private Integer newPigstyId;
 	/**
 	 * 旧单元
 	 */
-	private String oldUnit;
+	private Integer oldUnitId;
 	/**
 	 * 新单元
 	 */
-	private String newUnit;
+	private Integer newUnitId;
+	/**
+	 * 旧栏期
+	 */
+	private Integer oldPeriodId;
+	/**
+	 * 新栏期
+	 */
+	private Integer newPeriodId;
 	/**
 	 * 创建时间
 	 */

huimv-smart-management/src/main/java/com/huimv/management/entity/vo/TransferPeriodLogVo.java

@@ -0,0 +1,84 @@
+package com.huimv.management.entity.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 转栏记录vo
+ * </p>
+ *
+ * @author yinhao
+ * @version 1.0
+ * @date 2021/6/23 11:26
+ */
+@Data
+public class TransferPeriodLogVo  implements Serializable {
+    private static final long serialVersionUID = -8258217843543138466L;
+
+    /**
+     * 主键
+     */
+    private Integer id;
+    /**
+     * 猪id
+     */
+    private Integer pigId;
+    /**
+     * 猪耳标
+     */
+    private String earTag;
+    /**
+     * 旧猪舍id
+     */
+    private Integer oldPigstyId;
+    /**
+     * 旧猪舍名称
+     */
+    private String oldPigstyName;
+    /**
+     * 新猪舍
+     */
+    private Integer newPigstyId;
+    /**
+     * 旧猪舍名称
+     */
+    private String newPigstyName;
+    /**
+     * 旧单元
+     */
+    private Integer oldUnitId;
+    /**
+     * 旧单元名称
+     */
+    private String oldUnitName;
+    /**
+     * 新单元
+     */
+    private Integer newUnitId;
+    /**
+     * 新单元名称
+     */
+    private String newUintName;
+    /**
+     * 旧栏期
+     */
+    private Integer oldPeriodId;
+    /**
+     * 旧栏期名称
+     */
+    private String oldPeriodName;
+    /**
+     * 新栏期
+     */
+    private Integer newPeriodId;
+    /**
+     * 新栏期名称
+     */
+    private String newPeriodName;
+    /**
+     * 操作人
+     */
+    private String operatorUsername;
+}

huimv-smart-management/src/main/java/com/huimv/management/service/impl/TransferPeriodLogServiceImpl.java

@@ -1,5 +1,7 @@
 package com.huimv.management.service.impl;
 
+import com.huimv.management.entity.vo.TransferPeriodLogVo;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,11 +20,37 @@ public class TransferPeriodLogServiceImpl extends ServiceImpl<TransferPeriodLogD
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
-        IPage<TransferPeriodLogEntity> page = this.page(
-                new Query<TransferPeriodLogEntity>().getPage(params),
-                new QueryWrapper<TransferPeriodLogEntity>()
-        );
+        QueryWrapper<TransferPeriodLogVo> queryWrapper = new QueryWrapper<>();
 
+        String earTag = (String) params.get("earTag");
+        if (StringUtils.isNotBlank(earTag)) {
+            queryWrapper.like("log.ear_tag",earTag);
+        }
+
+        String oldPigstyId = (String) params.get("oldPigstyId");
+        if (StringUtils.isNotBlank(oldPigstyId)) {
+            queryWrapper.eq("log.old_pigsty_id",Integer.parseInt(oldPigstyId));
+        }
+
+        String newPigStyId = (String) params.get("newPigStyId");
+        if (StringUtils.isNotBlank(newPigStyId)) {
+            queryWrapper.eq("log.new_pigsty_id",newPigStyId);
+        }
+
+        String oldUnitId = (String) params.get("oldUnitId");
+        if (StringUtils.isNotBlank(oldUnitId)) {
+            queryWrapper.eq("log.old_unit_id",Integer.parseInt(oldUnitId));
+        }
+
+        String newUnitId = (String) params.get("newUnitId");
+        if (StringUtils.isNotBlank(oldUnitId)) {
+            queryWrapper.eq("log.new_unit_id",Integer.parseInt(newUnitId));
+        }
+
+        queryWrapper.apply("pigsty1.deleted = 0 AND pigsty2.deleted = 0 AND uint1.deleted = 0 AND unit2.deleted = 0 AND period1.deleted = 0 AND period2.deleted = 0");
+        queryWrapper.orderByDesc("log.gmt_create");
+
+        IPage<TransferPeriodLogVo> page = baseMapper.page(new Query<>().getPage(params), queryWrapper);
         return new PageUtils(page);
     }
 

huimv-smart-management/src/main/java/com/huimv/management/service/impl/YearPigBaseServiceImpl.java

@@ -49,6 +49,15 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
     @Autowired
     private YearPigBaseDao pigBaseDao;
 
+    @Autowired
+    private PeriodDao periodDao;
+
+    @Autowired
+    private UnitDao unitDao;
+
+    @Autowired
+    private TransferPeriodLogDao transferPeriodLogDao;
+
 //    @Override
 //    public PageUtils queryPage(Map<String, Object> params) {
 //
@@ -267,21 +276,6 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
         return endList;
     }
 
-    @Autowired
-    private RestTemplate restTemplate;
-
-    @Value("${user.info.url}")
-    private String url;
-
-    @Autowired
-    private PeriodDao periodDao;
-
-    @Autowired
-    private UnitDao unitDao;
-
-    @Autowired
-    private TransferPeriodLogDao transferPeriodLogDao;
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void transferPeriod(HashMap<String, Object> map, HttpServletRequest request) {
@@ -300,6 +294,7 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
         String username = user.getUsername();
 
         for (Integer pigId : pigIds) {
+
             YearPigBaseEntity oldEntity = baseMapper.selectById(pigId);
             if (oldEntity == null) {
                 throw new RRException("查不到id为" + pigId + "的猪的信息,请检查参数!",1001);
@@ -307,26 +302,22 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
             if (oldEntity.getUnitId().equals(unitId)) {
                 throw new RRException(oldEntity.getEartag() + "所转单元不能和原单元相同!",1001);
             }
-            Integer oldPeriodId = oldEntity.getPeriodId();
-            String oldPeriodName = periodDao.selectById(oldPeriodId).getNumber();
-            Integer oldUnitId = oldEntity.getUnitId();
-            String oldUnitName = unitDao.selectById(oldUnitId).getNumber();
 
             UnitEntity unitEntity = unitDao.selectById(unitId);
             if (unitEntity == null) {
                 throw new RRException("查不到id为" + unitId + "的单元的信息,请检查参数!",1001);
             }
-            String newUnitName = unitEntity.getNumber();
-            String newPeriodName = periodDao.selectById(unitEntity.getCurrentPeriodId()).getNumber();
-
 
             TransferPeriodLogEntity entity = new TransferPeriodLogEntity();
             entity.setFarmId(unitEntity.getFarmId());
+            entity.setPigId(pigId);
             entity.setEarTag(oldEntity.getEartag());
-            entity.setOldPeriod(oldPeriodName);
-            entity.setOldUnit(oldUnitName);
-            entity.setNewPeriod(newPeriodName);
-            entity.setNewUnit(newUnitName);
+            entity.setOldPigstyId(oldEntity.getPigstyId());
+            entity.setNewPigstyId(unitEntity.getPigstyId());
+            entity.setOldUnitId(oldEntity.getUnitId());
+            entity.setNewUnitId(unitId);
+            entity.setOldPeriodId(oldEntity.getPeriodId());
+            entity.setNewPeriodId(unitEntity.getCurrentPeriodId());
             entity.setOperatorUsername(username);
             logEntityList.add(entity);
 

huimv-smart-management/src/main/java/com/huimv/management/util/GetUserUtil.java

@@ -51,11 +51,14 @@ public class GetUserUtil {
         HttpEntity httpEntity = new HttpEntity<>(null, headers);
 
         ResponseEntity<R> responseEntity = restTemplate.exchange(url, HttpMethod.GET, httpEntity, R.class);
-        R sysUserEntity = responseEntity.getBody();
-        if (401 == (Integer) (sysUserEntity.get("code"))) {
-            throw new RRException((String) sysUserEntity.get("msg"), (Integer) sysUserEntity.get("code"));
+        R r = responseEntity.getBody();
+        if (r != null && 401 == (Integer) (r.get("code"))) {
+            throw new RRException((String) r.get("msg"), (Integer) r.get("code"));
+        }
+        String jsonString = null;
+        if (r != null) {
+            jsonString = JSONObject.toJSONString(r.get("user"));
         }
-        String jsonString = JSONObject.toJSONString(sysUserEntity.get("user"));
         SysUserEntity user = JSONObject.parseObject(jsonString, SysUserEntity.class);
         return user;
     }

huimv-smart-management/src/main/resources/mapper/management/TransferPeriodLogDao.xml

@@ -7,26 +7,33 @@
     <resultMap type="com.huimv.management.entity.TransferPeriodLogEntity" id="transferPeriodLogMap">
         <result property="id" column="id"/>
         <result property="farmId" column="farm_id" />
+        <result property="pigId" column="pig_id"/>
         <result property="earTag" column="ear_tag"/>
-        <result property="oldPeriod" column="old_period"/>
-        <result property="newPeriod" column="new_period"/>
-        <result property="oldUnit" column="old_unit"/>
-        <result property="newUnit" column="new_unit"/>
+        <result property="oldPigstyId" column="old_period_id"/>
+        <result property="newPigstyId" column="new_period_id"/>
+        <result property="oldUnitId" column="old_unit_id"/>
+        <result property="newUnitId" column="new_unit_id"/>
+        <result property="oldPeriodId" column="old_period_id"/>
+        <result property="newPeriodId" column="new_period_id"/>
         <result property="gmtCreate" column="gmt_create"/>
         <result property="gmtModified" column="gmt_modified"/>
         <result property="operatorUsername" column="operator_username"/>
     </resultMap>
 
+    <!--批量插入-->
     <insert id="batchInsert">
-        INSERT INTO mgt_transfer_period_log(farm_id,ear_tag, old_period, new_period, old_unit, new_unit, gmt_create, gmt_modified, operator_username) VALUES
+        INSERT INTO mgt_transfer_period_log(farm_id, pig_id, ear_tag, old_unit_id, new_unit_id, old_period_id, new_period_id, gmt_create, gmt_modified, operator_username) values
         <foreach collection="list" item="item" separator=",">
             (
             #{item.farmId},
+            #{item.pigId},
             #{item.earTag},
-            #{item.oldPeriod},
-            #{item.newPeriod},
-            #{item.oldUnit},
-            #{item.newUnit},
+            #{item.oldPigstyId},
+            #{item.newPigstyId},
+            #{item.oldUnitId},
+            #{item.newUnitId},
+            #{item.oldPeriodId},
+            #{item.newPeriodId},
             now(),
             now(),
             #{item.operatorUsername}
@@ -34,5 +41,33 @@
         </foreach>
     </insert>
 
+    <!--分页条件查询-->
+    <select id="page" resultType="com.huimv.management.entity.vo.TransferPeriodLogVo">
+        SELECT
+          log.id,
+          log.pig_id,
+          old_pigsty_id,
+          pigsty1.number old_pigsty_name,
+          new_pigsty_id,
+          pigsty2.number new_pigsty_name,
+          old_unit_id,
+          unit1.number old_uint_name,
+          new_unit_id,
+          unit2.number new_unit_name,
+          old_period_id,
+          period1.number old_period_name,
+          new_period_id,
+          period2.number new_period_name,
+          operator_username
+        FROM mgt_transfer_period_log log
+        JOIN mgt_pigsty pigsty1 ON log.old_pigsty_id = pigsty1.id
+        JOIN mgt_pigsty pigsty2 ON log.new_pigsty_id = pigsty2.id
+        JOIN mgt_unit unit1 ON log.old_unit_id = unit1.id
+        JOIN mgt_unit unit2 ON log.new_unit_id = unit2.id
+        JOIN mgt_period period1 ON  log.old_period_id = period1.id
+        JOIN mgt_period period2 ON log.new_period_id = period2.id
+        ${ew.customSqlSegment}
+    </select>
+
 
 </mapper>

renren-fast/pom.xml

@@ -40,7 +40,7 @@
         <gson.version>2.8.5</gson.version>
         <fastjson.version>1.2.72</fastjson.version>
         <hutool.version>4.1.1</hutool.version>
-        <lombok.version>1.18.4</lombok.version>
+        <lombok.version>1.18.14</lombok.version>
 
         <!--wagon plugin 配置-->
         <service-path>/work/renren</service-path>

renren-fast/src/main/java/io/renren/RenrenApplication.java

@@ -9,7 +9,6 @@
 package io.renren;
 
 import com.huimv.common.autoconfigure.MybatisPlusConfiguration;
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 

renren-fast/src/main/java/io/renren/modules/sys/entity/SysLogEntity.java

@@ -42,4 +42,67 @@ public class SysLogEntity implements Serializable {
 	//创建时间
 	private Date createDate;
 
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public String getOperation() {
+		return operation;
+	}
+
+	public void setOperation(String operation) {
+		this.operation = operation;
+	}
+
+	public String getMethod() {
+		return method;
+	}
+
+	public void setMethod(String method) {
+		this.method = method;
+	}
+
+	public String getParams() {
+		return params;
+	}
+
+	public void setParams(String params) {
+		this.params = params;
+	}
+
+	public Long getTime() {
+		return time;
+	}
+
+	public void setTime(Long time) {
+		this.time = time;
+	}
+
+	public String getIp() {
+		return ip;
+	}
+
+	public void setIp(String ip) {
+		this.ip = ip;
+	}
+
+	public Date getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
 }

renren-generator/src/main/resources/generator.properties

@@ -6,6 +6,8 @@ package=com.huimv
 moduleName=management
 #\u4F5C\u8005
 author=yinhao
+#\u7248\u672C
+version=1.0
 #Email
 email=yinhao@163.com
 #\u8868\u524D\u7F00(\u7C7B\u540D\u4E0D\u4F1A\u5305\u542B\u8868\u524D\u7F00)

renren-generator/src/main/resources/template/Controller.java.vm

@@ -21,7 +21,7 @@ import ${mainPath}.common.utils.R;
  * ${comments}
  *
  * @author ${author}
- * @email ${email}
+ * @version ${version}
  * @date ${datetime}
  */
 @RestController

renren-generator/src/main/resources/template/Dao.java.vm

@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper;
  * ${comments}
  * 
  * @author ${author}
- * @email ${email}
+ * @version ${version}
  * @date ${datetime}
  */
 @Mapper

renren-generator/src/main/resources/template/Entity.java.vm

@@ -14,7 +14,7 @@ import lombok.Data;
  * ${comments}
  * 
  * @author ${author}
- * @email ${email}
+ * @version ${version}
  * @date ${datetime}
  */
 @Data

renren-generator/src/main/resources/template/MongoChildrenEntity.java.vm

@@ -15,7 +15,7 @@ import org.springframework.data.annotation.Id;
  * ${comments}
  * 
  * @author ${author}
- * @email ${email}
+ * @version ${version}
  * @date ${datetime}
  */
 @Data

renren-generator/src/main/resources/template/MongoEntity.java.vm

@@ -18,7 +18,7 @@ import org.springframework.data.annotation.Id;
  * ${comments}
  * 
  * @author ${author}
- * @email ${email}
+ * @version ${version}
  * @date ${datetime}
  */
 @Data

renren-generator/src/main/resources/template/Service.java.vm

@@ -10,7 +10,7 @@ import java.util.Map;
  * ${comments}
  *
  * @author ${author}
- * @email ${email}
+ * @version ${version}
  * @date ${datetime}
  */
 public interface ${className}Service extends IService<${className}Entity> {

renren-generator/src/main/resources/template/ServiceImpl.java.vm

@@ -12,7 +12,13 @@ import ${package}.${moduleName}.dao.${className}Dao;
 import ${package}.${moduleName}.entity.${className}Entity;
 import ${package}.${moduleName}.service.${className}Service;
 
-
+/**
+ * ${comments}
+ *
+ * @author ${author}
+ * @version ${version}
+ * @date ${datetime}
+ */
 @Service("${classname}Service")
 public class ${className}ServiceImpl extends ServiceImpl<${className}Dao, ${className}Entity> implements ${className}Service {