2021/7/21 润农数据采集&修改/sys/user/info接口

huimv-smart-apiservice/src/main/java/com/huimv/apiservice/MathTestMain.java

@@ -1,5 +1,11 @@
 package com.huimv.apiservice;
 
+import org.apache.commons.codec.binary.Hex;
+
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Date;
 import java.util.Random;
 
 /**
@@ -9,7 +15,7 @@ import java.util.Random;
  */
 public class MathTestMain {
 
-    public static void main(String[] args) {
+    public static void main(String[] args) throws NoSuchAlgorithmException {
 
 //        System.out.println(System.currentTimeMillis());
 //
@@ -26,11 +32,21 @@ public class MathTestMain {
 //
 //        System.out.println(String.format("%.2f", 123.5549));
 
-        Random random = new Random();
-        for (int i = 0; i < 20; i++) {
-            int num = 144 +  random.nextInt(5);
-            System.out.println(num);
-        }
+//        Random random = new Random();
+//        for (int i = 0; i < 20; i++) {
+//            int num = 144 +  random.nextInt(5);
+//            System.out.println(num);
+//        }
+
+        MessageDigest md = MessageDigest.getInstance("MD5");
+
+        long currentTimeMillis = System.currentTimeMillis();
+        System.out.println(currentTimeMillis);
+        String data = 20 + ";" + currentTimeMillis;
+        String oneSign = Hex.encodeHexString(md.digest(data.getBytes(StandardCharsets.UTF_8)));
+        oneSign = oneSign + "HuiMv";
+        String twoSign = Hex.encodeHexString(md.digest(oneSign.getBytes(StandardCharsets.UTF_8)));
+        System.out.println(twoSign);
 
     }
 }

huimv-smart-apiservice/src/main/java/com/huimv/apiservice/controller/PigController.java

@@ -76,7 +76,7 @@ public class PigController {
     public R getListByBreed(@RequestParam(value = "accessToken") String accessToken,
                             @NotBlank(message = "品种名称不能为空!") @RequestParam("breedName") String breedName,
                             @RequestParam(value = "currentPage", defaultValue = "1") Integer currentPage,
-                            @Range(min = 1, max = 1000, message = "每页条数的范围为1-1000") @RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize,
+                            @Range(min = 1, max = 10000, message = "每页条数的范围为1-10000") @RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize,
                             @RequestParam(value = "period", required = false) String period) {
         PageUtils page = pigService.getPageByBreedAndFence(breedName, currentPage, pageSize, period);
         return Objects.requireNonNull(R.ok().put("code", 1000)).put("page", page);
@@ -152,4 +152,13 @@ public class PigController {
         List<HealthMedicalRecordEntity> list = pigService.getAbnormalStatus(pigEarTagNo);
         return Objects.requireNonNull(R.ok().put("code", 1000)).put("data", list);
     }
+
+//    @PostMapping("/test")
+//    public R test(@RequestParam(value = "accessToken") String accessToken,
+//                  Student student) {
+//
+//        System.out.println(student);
+//        return R.ok();
+//
+//    }
 }

huimv-smart-apiservice/src/main/java/com/huimv/apiservice/controller/TokenController.java

@@ -45,7 +45,6 @@ public class TokenController {
         String oneSign = Hex.encodeHexString(md.digest(data.getBytes(StandardCharsets.UTF_8)));
         oneSign = oneSign + "HuiMv";
         String twoSign = Hex.encodeHexString(md.digest(oneSign.getBytes(StandardCharsets.UTF_8)));
-        System.out.println(twoSign);
 
 
         if (!sign.equals(twoSign)) {

huimv-smart-apiservice/src/main/java/com/huimv/apiservice/dao/EartagDateDao.java

@@ -1,7 +1,7 @@
 package com.huimv.apiservice.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huimv.apiservice.entity.EartagDateEntity;
+import com.huimv.apiservice.entity.EartagDataEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 
@@ -14,11 +14,6 @@ import org.springframework.stereotype.Repository;
  */
 @Mapper
 @Repository
-public interface EartagDateDao extends BaseMapper<EartagDateEntity> {
-
-
-
-
-
+public interface EartagDataDao extends BaseMapper<EartagDataEntity> {
 
 }

huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/EartagDateEntity.java

@@ -15,8 +15,8 @@ import java.util.Date;
  * @date 2021-06-21 10:00:18
  */
 @Data
-@TableName("eartag_date")
-public class EartagDateEntity implements Serializable {
+@TableName("eartag_data")
+public class EartagDataEntity implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	/**

huimv-smart-apiservice/src/main/java/com/huimv/apiservice/service/impl/PigServiceImpl.java

@@ -39,7 +39,7 @@ import java.util.*;
 public class PigServiceImpl extends ServiceImpl<PigDao, YearPigBaseEntity> implements PigService {
 
     @Autowired
-    private EartagDateDao eartagDateDao;
+    private EartagDataDao eartagDataDao;
 
     @Autowired
     private AnimalHeatDao animalHeatDao;
@@ -86,25 +86,25 @@ public class PigServiceImpl extends ServiceImpl<PigDao, YearPigBaseEntity> imple
 
         //公用时间 -> 当前日期
         String today = DateUtil.format(currentTime, "yyyy-MM-dd");
-        LambdaQueryWrapper<EartagDateEntity> lambdaQueryWrapper = Wrappers.lambdaQuery();
-        lambdaQueryWrapper.eq(EartagDateEntity::getEartagId, pigEarTagNo)
-                .ge(EartagDateEntity::getCreateTime, DateUtil.offsetDay(new Date(), -1));
+        LambdaQueryWrapper<EartagDataEntity> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(EartagDataEntity::getEartagId, pigEarTagNo)
+                .ge(EartagDataEntity::getCreateTime, DateUtil.offsetDay(new Date(), -1));
 
 
-        List<EartagDateEntity> eartagDateEntityList = eartagDateDao.selectList(lambdaQueryWrapper);
+        List<EartagDataEntity> eartagDataEntityList = eartagDataDao.selectList(lambdaQueryWrapper);
         List<AnimalHeatVo> animalHeatVoList = new ArrayList<>();
         List<SportTimeVo> sportTimeVoList = new ArrayList<>();
-        if (CollUtil.isNotEmpty(eartagDateEntityList)) {
-            for (EartagDateEntity eartagDateEntity : eartagDateEntityList) {
+        if (CollUtil.isNotEmpty(eartagDataEntityList)) {
+            for (EartagDataEntity eartagDataEntity : eartagDataEntityList) {
                 AnimalHeatVo animalHeatVo = new AnimalHeatVo();
-                Date createTime = eartagDateEntity.getCreateTime();
+                Date createTime = eartagDataEntity.getCreateTime();
                 animalHeatVo.setCollectTime(createTime);
-                animalHeatVo.setTemperature(eartagDateEntity.getEartagTemp());
+                animalHeatVo.setTemperature(eartagDataEntity.getEartagTemp());
                 animalHeatVoList.add(animalHeatVo);
 
                 SportTimeVo sportTimeVo = new SportTimeVo();
                 sportTimeVo.setCollectTime(createTime);
-                sportTimeVo.setSportCount(eartagDateEntity.getCountSport());
+                sportTimeVo.setSportCount(eartagDataEntity.getCountSport());
                 sportTimeVoList.add(sportTimeVo);
             }
         }
@@ -217,12 +217,15 @@ public class PigServiceImpl extends ServiceImpl<PigDao, YearPigBaseEntity> imple
         envVo.setPigEarTagNo(pigEarTagNo);
         envVo.setDate(today);
 
+        IndoorEnvVo indoorEnvVo = new IndoorEnvVo();
+
         List<ValueVo> temperatureVoList = selectIndoorEnvByType(pigstyId, ((short) 1));
-        envVo.getIndoorEnv().setTemperatureList(temperatureVoList);
+        indoorEnvVo.setTemperatureList(temperatureVoList);
         List<ValueVo> humidityVoList = selectIndoorEnvByType(pigstyId, ((short) 2));
-        envVo.getIndoorEnv().setHumidityList(humidityVoList);
+        indoorEnvVo.setHumidityList(humidityVoList);
         List<ValueVo> gasVoList = selectIndoorEnvByType(pigstyId, ((short) 3));
-        envVo.getIndoorEnv().setGasList(gasVoList);
+        indoorEnvVo.setGasList(gasVoList);
+        envVo.setIndoorEnv(indoorEnvVo);
 
         LambdaQueryWrapper<OutdoorEnvironmentEntity> outdoorEnvLambdaQuery = Wrappers.lambdaQuery();
         outdoorEnvLambdaQuery.eq(OutdoorEnvironmentEntity::getFarmId, farmId)
@@ -283,7 +286,7 @@ public class PigServiceImpl extends ServiceImpl<PigDao, YearPigBaseEntity> imple
 
         LambdaUpdateWrapper<YearPigBaseEntity> pigBaseLambdaUpdate = Wrappers.lambdaUpdate();
         pigBaseLambdaUpdate.eq(YearPigBaseEntity::getEartag, pigEarTagNo)
-                .set(YearPigBaseEntity::getDeleted, System.currentTimeMillis())
+                .set(YearPigBaseEntity::getDeleted, System.currentTimeMillis() / 1000)
                 .set(YearPigBaseEntity::getFosterStatus, false)
                 .set(YearPigBaseEntity::getOutFenceTime, new Date())
                 .set(YearPigBaseEntity::getOutFenceStatus, status);
@@ -297,8 +300,8 @@ public class PigServiceImpl extends ServiceImpl<PigDao, YearPigBaseEntity> imple
 
         YearPigBaseEntity yearPigBaseEntity = getYearPigBaseEntity(pigEarTagNo);
 
-        if (!yearPigBaseEntity.getFosterStatus() || yearPigBaseEntity.getOutFenceStatus() != 0) {
-            throw new RRException("请检查目前的认养状态或出栏状态!", 1001);
+        if ( !yearPigBaseEntity.getFosterStatus() || yearPigBaseEntity.getOutFenceStatus() != 0) {
+            throw new RRException("操作失败,该小猪目前未被认养或已经出栏!", 1001);
         }
 
         LambdaUpdateWrapper<YearPigBaseEntity> pigBaseLambdaUpdate = Wrappers.lambdaUpdate();

huimv-smart-apiservice/src/main/java/com/huimv/apiservice/task/CreateEverydayDataTask.java

@@ -1,143 +1,143 @@
-package com.huimv.apiservice.task;
-
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
-import com.huimv.apiservice.dao.IndoorEnvironmentDao;
-import com.huimv.apiservice.dao.OutdoorEnvironmentDao;
-import com.huimv.apiservice.entity.IndoorEnvironmentEntity;
-import com.huimv.apiservice.entity.OutdoorEnvironmentEntity;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Random;
-
-/**
- * <p>
- * 定时任务
- * </p>
- *
- * @author yinhao
- * @date 2021/5/26 15:16
- */
-@Configuration
-@EnableScheduling
-@EnableAsync
-public class CreateEverydayDataTask {
-
-    @Autowired
-    private IndoorEnvironmentDao indoorEnvironmentDao;
-
-    @Autowired
-    private OutdoorEnvironmentDao outdoorEnvironmentDao;
-
-    @Async
-    //@Scheduled(cron = "1 0 0 * * ?")
-        @Scheduled(cron = "30 15 14 * * ?")
-    void createTodayIndoorEnvData() {
-
-        System.out.println("createTodayIndoorEnvData begin------->");
-        DateTime today = DateUtil.beginOfDay(new Date());
-        Date collectTime = today;
-
-        List<String> gas = new ArrayList<>();
-        gas.add("优");
-        gas.add("良");
-        gas.add("轻度");
-        gas.add("中度");
-        gas.add("重度");
-        gas.add("严重");
-
-        Random random = new Random();
-        List<IndoorEnvironmentEntity> list = new ArrayList<>();
-        for (int i = 0; i < 288; i++) {
-
-            IndoorEnvironmentEntity entity = new IndoorEnvironmentEntity();
-
-            //当前日期
+//package com.huimv.apiservice.task;
+//
+//import cn.hutool.core.date.DateTime;
+//import cn.hutool.core.date.DateUtil;
+//import com.huimv.apiservice.dao.IndoorEnvironmentDao;
+//import com.huimv.apiservice.dao.OutdoorEnvironmentDao;
+//import com.huimv.apiservice.entity.IndoorEnvironmentEntity;
+//import com.huimv.apiservice.entity.OutdoorEnvironmentEntity;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.scheduling.annotation.Async;
+//import org.springframework.scheduling.annotation.EnableAsync;
+//import org.springframework.scheduling.annotation.EnableScheduling;
+//import org.springframework.scheduling.annotation.Scheduled;
+//
+//import java.math.BigDecimal;
+//import java.util.ArrayList;
+//import java.util.Date;
+//import java.util.List;
+//import java.util.Random;
+//
+///**
+// * <p>
+// * 定时任务
+// * </p>
+// *
+// * @author yinhao
+// * @date 2021/5/26 15:16
+// */
+//@Configuration
+//@EnableScheduling
+//@EnableAsync
+//public class CreateEverydayDataTask {
+//
+//    @Autowired
+//    private IndoorEnvironmentDao indoorEnvironmentDao;
+//
+//    @Autowired
+//    private OutdoorEnvironmentDao outdoorEnvironmentDao;
+//
+//    @Async
+//    //@Scheduled(cron = "1 0 0 * * ?")
+////        @Scheduled(cron = "30 15 14 * * ?")
+//    void createTodayIndoorEnvData() {
+//
+//        System.out.println("createTodayIndoorEnvData begin------->");
+//        DateTime today = DateUtil.beginOfDay(new Date());
+//        Date collectTime = today;
+//
+//        List<String> gas = new ArrayList<>();
+//        gas.add("优");
+//        gas.add("良");
+//        gas.add("轻度");
+//        gas.add("中度");
+//        gas.add("重度");
+//        gas.add("严重");
+//
+//        Random random = new Random();
+//        List<IndoorEnvironmentEntity> list = new ArrayList<>();
+//        for (int i = 0; i < 288; i++) {
+//
+//            IndoorEnvironmentEntity entity = new IndoorEnvironmentEntity();
+//
+//            //当前日期
+////            entity.setDate(today);
+////            //牧场id
+////            entity.setFarmId(144);
+////            //猪舍id
+////            entity.setPigstyId(56);
+////            //温度
+////            entity.setTemperature(getTemperature());
+////            //湿度
+////            entity.setHumidity(getHumidity());
+////            //空气质量
+////            entity.setAirQuality(gas.get(random.nextInt(5)));
+////            //采集时间
+//            entity.setCollectTime(collectTime);
+//            collectTime = DateUtil.offsetMinute(collectTime, 5);
+//            list.add(entity);
+//        }
+//
+//        indoorEnvironmentDao.batchInsertData(list);
+//        System.out.println("createTodayIndoorEnvData end------->");
+//    }
+//
+//    @Async
+//    //@Scheduled(cron = "1 0 0 * * ?")
+////    @Scheduled(cron = "30 15 14 * * ?")
+//    void createTodayOutdoorEnvData() {
+//
+//        System.out.println("createTodayOutdoorEnvData begin------->");
+//        DateTime today = DateUtil.beginOfDay(new Date());
+//        Date collectTime = today;
+//
+//        List<String> gas = new ArrayList<>();
+//        gas.add("优");
+//        gas.add("良");
+//        gas.add("轻度");
+//        gas.add("中度");
+//        gas.add("重度");
+//        gas.add("严重");
+//
+//        Random random = new Random();
+//        List<OutdoorEnvironmentEntity> list = new ArrayList<>();
+//        for (int i = 0; i < 288; i++) {
+//            OutdoorEnvironmentEntity entity = new OutdoorEnvironmentEntity();
 //            entity.setDate(today);
-//            //牧场id
 //            entity.setFarmId(144);
-//            //猪舍id
-//            entity.setPigstyId(56);
-//            //温度
 //            entity.setTemperature(getTemperature());
-//            //湿度
 //            entity.setHumidity(getHumidity());
-//            //空气质量
-//            entity.setAirQuality(gas.get(random.nextInt(5)));
-//            //采集时间
-            entity.setCollectTime(collectTime);
-            collectTime = DateUtil.offsetMinute(collectTime, 5);
-            list.add(entity);
-        }
-
-        indoorEnvironmentDao.batchInsertData(list);
-        System.out.println("createTodayIndoorEnvData end------->");
-    }
-
-    @Async
-    //@Scheduled(cron = "1 0 0 * * ?")
-    @Scheduled(cron = "30 15 14 * * ?")
-    void createTodayOutdoorEnvData() {
-
-        System.out.println("createTodayOutdoorEnvData begin------->");
-        DateTime today = DateUtil.beginOfDay(new Date());
-        Date collectTime = today;
-
-        List<String> gas = new ArrayList<>();
-        gas.add("优");
-        gas.add("良");
-        gas.add("轻度");
-        gas.add("中度");
-        gas.add("重度");
-        gas.add("严重");
-
-        Random random = new Random();
-        List<OutdoorEnvironmentEntity> list = new ArrayList<>();
-        for (int i = 0; i < 288; i++) {
-            OutdoorEnvironmentEntity entity = new OutdoorEnvironmentEntity();
-            entity.setDate(today);
-            entity.setFarmId(144);
-            entity.setTemperature(getTemperature());
-            entity.setHumidity(getHumidity());
-            entity.setAirQuality(gas.get(random.nextInt(4)));
-            entity.setCollectTime(collectTime);
-            collectTime = DateUtil.offsetMinute(collectTime, 5);
-            list.add(entity);
-        }
-
-        outdoorEnvironmentDao.batchInsertData(list);
-        System.out.println("createTodayOutdoorEnvData end------->");
-
-    }
-
-    @Async
-    @Scheduled(cron = "1 0 0 * * ?")
-        //@Scheduled(cron = "1 52 18 * * ?")
-    void callPigHealthData() {
-        System.out.println("callPigHealthData begin------->");
-        indoorEnvironmentDao.callPigHealthData();
-        System.out.println("callPigHealthData end------->");
-
-    }
-
-    private double getTemperature() {
-        BigDecimal bigDecimal = new BigDecimal(Math.random() * 3 + 23).setScale(1, BigDecimal.ROUND_HALF_UP);
-        return bigDecimal.doubleValue();
-    }
-
-    private double getHumidity(){
-        BigDecimal bigDecimal = new BigDecimal(Math.random() * 0.3 + 0.3).setScale(2, BigDecimal.ROUND_HALF_UP);
-        return bigDecimal.doubleValue();
-    }
-
-
-}
+//            entity.setAirQuality(gas.get(random.nextInt(4)));
+//            entity.setCollectTime(collectTime);
+//            collectTime = DateUtil.offsetMinute(collectTime, 5);
+//            list.add(entity);
+//        }
+//
+//        outdoorEnvironmentDao.batchInsertData(list);
+//        System.out.println("createTodayOutdoorEnvData end------->");
+//
+//    }
+//
+////    @Async
+////    @Scheduled(cron = "1 0 0 * * ?")
+////        //@Scheduled(cron = "1 52 18 * * ?")
+////    void callPigHealthData() {
+////        System.out.println("callPigHealthData begin------->");
+////        indoorEnvironmentDao.callPigHealthData();
+////        System.out.println("callPigHealthData end------->");
+////
+////    }
+//
+////    private double getTemperature() {
+////        BigDecimal bigDecimal = new BigDecimal(Math.random() * 3 + 23).setScale(1, BigDecimal.ROUND_HALF_UP);
+////        return bigDecimal.doubleValue();
+////    }
+////
+////    private double getHumidity(){
+////        BigDecimal bigDecimal = new BigDecimal(Math.random() * 0.3 + 0.3).setScale(2, BigDecimal.ROUND_HALF_UP);
+////        return bigDecimal.doubleValue();
+////    }
+//
+//
+//}

huimv-smart-apiservice/src/main/java/com/huimv/apiservice/task/DataCollectTask.java

@@ -0,0 +1,21 @@
+package com.huimv.apiservice.task;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author yinhao
+ * @date 2021/7/21 11:01
+ */
+@Configuration
+@EnableScheduling
+@EnableAsync
+public class DataCollectTask {
+
+
+}

huimv-smart-apiservice/src/main/resources/mapper/apiservice/OutdoorEnvironmentDao.xml

@@ -28,8 +28,11 @@
 
     <select id="select" resultType="com.huimv.apiservice.entity.vo.OutdoorEnvVo">
         SELECT
-
-        FROM mgt_outdoor_environment
+          collect_time,
+          temperature,
+          humidity,
+          air_quality
+        FROM mgt_outdoor_environment moe
         ${ew.customSqlSegment}
     </select>
 

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

@@ -3,6 +3,7 @@ package com.huimv.management;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import com.huimv.common.utils.Constant;
+import com.huimv.management.dao.YearPigPedigreeDao;
 import com.huimv.management.rsa.JdkSignatureUtil;
 import com.huimv.management.util.GetUserUtil;
 import org.apache.tomcat.util.codec.binary.Base64;
@@ -114,9 +115,15 @@ public class Abc {
 
 //        System.out.println(DateUtil.date());
 
-        StringJoiner sj = new StringJoiner(",","未找到耳标号为：","的信息，请检查输入的耳标信息是否有误！");
-        System.out.println(sj.length());
-        sj.add("123456");
-        System.out.println(sj.length());
+//        StringJoiner sj = new StringJoiner(",","未找到耳标号为：","的信息，请检查输入的耳标信息是否有误！");
+//        System.out.println(sj.length());
+//        sj.add("123456");
+//        System.out.println(sj.length());
+
+        Class<? super YearPigPedigreeDao> superclass = YearPigPedigreeDao.class.getSuperclass();
+        System.out.println(superclass);
+        for (Class<?> anInterface : YearPigPedigreeDao.class.getInterfaces()) {
+            System.out.println(anInterface);
+        }
     }
 }

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

@@ -54,17 +54,17 @@ public class EartagDataController {
      */
     @RequestMapping("/info/{id}")
     public R info(@PathVariable("id") Integer id){
-		EartagDataEntity eartagDate = eartagDataService.getById(id);
+		EartagDataEntity eartagData = eartagDataService.getById(id);
 
-        return R.ok().put("eartagDate", eartagDate);
+        return R.ok().put("eartagData", eartagData);
     }
 
     /**
      * 保存
      */
     @RequestMapping("/save")
-    public R save(@RequestBody EartagDataEntity eartagDate){
-        eartagDataService.save(eartagDate);
+    public R save(@RequestBody EartagDataEntity eartagData){
+		eartagDataService.save(eartagData);
 
         return R.ok();
     }
@@ -73,8 +73,8 @@ public class EartagDataController {
      * 修改
      */
     @RequestMapping("/update")
-    public R update(@RequestBody EartagDataEntity eartagDate){
-        eartagDataService.updateById(eartagDate);
+    public R update(@RequestBody EartagDataEntity eartagData){
+		eartagDataService.updateById(eartagData);
 
         return R.ok();
     }
@@ -84,7 +84,7 @@ public class EartagDataController {
      */
     @RequestMapping("/delete")
     public R delete(@RequestBody Integer[] ids){
-        eartagDataService.removeByIds(Arrays.asList(ids));
+		eartagDataService.removeByIds(Arrays.asList(ids));
 
         return R.ok();
     }

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

@@ -14,9 +14,4 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface EartagDataDao extends BaseMapper<EartagDataEntity> {
 
-
-
-
-
-
 }

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

@@ -0,0 +1,237 @@
+package com.huimv.management.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 饲喂记录表
+ * </p>
+ *
+ * @author yinhao
+ * @date 2021/7/21 9:59
+ */
+@TableName("mgt_feed_record")
+public class FeedRecordEntity implements Serializable {
+
+    private static final long serialVersionUID = -1186939707601628197L;
+
+    /**
+     * 主键id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 牧场名称
+     */
+    @TableField("pig_farm_name")
+    private String pigFarm__name;
+    /**
+     * 牧场id
+     */
+    @TableField("pig_farm_id")
+    private String pigFarm__id;
+    /**
+     * 测定站设备名称
+     */
+    @TableField("pms_device_list_name")
+    private String pmsDeviceList__name;
+    /**
+     * 是否有效
+     */
+    //@TableField("is_valid")
+    private Boolean isValid;
+    /**
+     * 采食量(g)
+     */
+    //@TableField("feed_weight")
+    private Integer feedWeight;
+    /**
+     * 体重(g)
+     */
+    private Integer weight;
+    /**
+     * 猪id
+     */
+    @TableField("pms_pig_id")
+    private String pmsPig__id;
+    /**
+     * 采食时长(s)
+     */
+    private Integer times;
+    /**
+     * 采食速度(g/min)
+     */
+    private Integer feedSpeed;
+    /**
+     * 耳标确认码
+     */
+    @TableField("pms_pig_ear_identify")
+    private String pmsPig__earIdentify;
+    /**
+     * 单杯料重(g)
+     */
+    private Integer unitAmount;
+    /**
+     * 采食/体重 (料重比)
+     */
+    private Integer feedWeightRate;
+    /**
+     * 采食开始时间
+     */
+    private Date startTime;
+    /**
+     * 数据id
+     */
+    private String dataId;
+    /**
+     * 采食结束时间
+     */
+    private Date endTime;
+    /**
+     * 猪耳标号
+     */
+    @TableField("pms_pig_ear_number")
+    private String pmsPig__earNumber;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPigFarm__name() {
+        return pigFarm__name;
+    }
+
+    public void setPigFarm__name(String pigFarm__name) {
+        this.pigFarm__name = pigFarm__name;
+    }
+
+    public String getPigFarm__id() {
+        return pigFarm__id;
+    }
+
+    public void setPigFarm__id(String pigFarm__id) {
+        this.pigFarm__id = pigFarm__id;
+    }
+
+    public String getPmsDeviceList__name() {
+        return pmsDeviceList__name;
+    }
+
+    public void setPmsDeviceList__name(String pmsDeviceList__name) {
+        this.pmsDeviceList__name = pmsDeviceList__name;
+    }
+
+    public Boolean getIsValid() {
+        return isValid;
+    }
+
+    public void setIsValid(Boolean valid) {
+        isValid = valid;
+    }
+
+    public Integer getFeedWeight() {
+        return feedWeight;
+    }
+
+    public void setFeedWeight(Integer feedWeight) {
+        this.feedWeight = feedWeight;
+    }
+
+    public Integer getWeight() {
+        return weight;
+    }
+
+    public void setWeight(Integer weight) {
+        this.weight = weight;
+    }
+
+    public String getPmsPig__id() {
+        return pmsPig__id;
+    }
+
+    public void setPmsPig__id(String pmsPig__id) {
+        this.pmsPig__id = pmsPig__id;
+    }
+
+    public Integer getTimes() {
+        return times;
+    }
+
+    public void setTimes(Integer times) {
+        this.times = times;
+    }
+
+    public Integer getFeedSpeed() {
+        return feedSpeed;
+    }
+
+    public void setFeedSpeed(Integer feedSpeed) {
+        this.feedSpeed = feedSpeed;
+    }
+
+    public String getPmsPig__earIdentify() {
+        return pmsPig__earIdentify;
+    }
+
+    public void setPmsPig__earIdentify(String pmsPig__earIdentify) {
+        this.pmsPig__earIdentify = pmsPig__earIdentify;
+    }
+
+    public Integer getUnitAmount() {
+        return unitAmount;
+    }
+
+    public void setUnitAmount(Integer unitAmount) {
+        this.unitAmount = unitAmount;
+    }
+
+    public Integer getFeedWeightRate() {
+        return feedWeightRate;
+    }
+
+    public void setFeedWeightRate(Integer feedWeightRate) {
+        this.feedWeightRate = feedWeightRate;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getDataId() {
+        return dataId;
+    }
+
+    public void setDataId(String dataId) {
+        this.dataId = dataId;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getPmsPig__earNumber() {
+        return pmsPig__earNumber;
+    }
+
+    public void setPmsPig__earNumber(String pmsPig__earNumber) {
+        this.pmsPig__earNumber = pmsPig__earNumber;
+    }
+}

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

@@ -3,6 +3,7 @@ package com.huimv.management.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -67,10 +68,10 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
            //过滤时间
           lambdaQuery.between(EartagDataEntity::getCreateTime,startTime, endTime);
 
-          List<EartagDataEntity> eartagDateEntities = baseMapper.selectList(lambdaQuery);
+          List<EartagDataEntity> eartagDataEntities = baseMapper.selectList(lambdaQuery);
 
         List<EartagDataEntity> list = new ArrayList();
-        for (EartagDataEntity data : eartagDateEntities) {
+        for (EartagDataEntity data : eartagDataEntities) {
 
             Date times = data.getCreateTime();
             if (startTime.before(times) && endTime.after(times)){
@@ -114,17 +115,17 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
 
         LambdaQueryWrapper<EartagDataEntity> lambdaQuery = Wrappers.lambdaQuery();
 
-        lambdaQuery.eq(StringUtils.isNotBlank(eartag), EartagDataEntity::getEartagId,eartag);
-        lambdaQuery.le(StringUtils.isNotBlank(endTime), EartagDataEntity::getCreateTime,endTime);
-        lambdaQuery.ge(StringUtils.isNotBlank(startTime), EartagDataEntity::getCreateTime,startTime);
+        lambdaQuery.eq(StringUtils.isNotBlank(eartag),EartagDataEntity::getEartagId,eartag);
+        lambdaQuery.le(StringUtils.isNotBlank(endTime),EartagDataEntity::getCreateTime,endTime);
+        lambdaQuery.ge(StringUtils.isNotBlank(startTime),EartagDataEntity::getCreateTime,startTime);
 
-        List<EartagDataEntity> eartagDateEntities = baseMapper.selectList(lambdaQuery);
+        List<EartagDataEntity> eartagDataEntities = baseMapper.selectList(lambdaQuery);
 
         List timeList = new ArrayList();
         List dataList = new ArrayList();
-        for (EartagDataEntity eartagDateEntity : eartagDateEntities) {
-            timeList.add(eartagDateEntity.getCreateTime());
-            dataList.add(eartagDateEntity.getEartagTemp());
+        for (EartagDataEntity eartagDataEntity : eartagDataEntities) {
+            timeList.add(eartagDataEntity.getCreateTime());
+            dataList.add(eartagDataEntity.getEartagTemp());
         }
 
         Map map = new HashMap();

renren-fast/src/main/java/io/renren/modules/sys/controller/SysUserController.java

@@ -21,6 +21,7 @@ import io.renren.common.validator.group.UpdateGroup;
 import io.renren.modules.sys.dao.SysUserFarmChooseDao;
 import io.renren.modules.sys.entity.SysUserEntity;
 import io.renren.modules.sys.entity.SysUserFarmChooseEntity;
+import io.renren.modules.sys.entity.vo.SysUserVo;
 import io.renren.modules.sys.form.PasswordForm;
 import io.renren.modules.sys.service.SysUserRoleService;
 import io.renren.modules.sys.service.SysUserService;
@@ -69,7 +70,9 @@ public class SysUserController extends AbstractController {
      */
     @GetMapping("/info")
     public R info() {
-        return R.ok().put("user", getUser());
+        SysUserEntity user = getUser();
+        SysUserVo sysUserVo = sysUserService.getUserInfo(user);
+        return R.ok().put("user", sysUserVo);
     }
 
     /**

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

@@ -1,9 +1,11 @@
 package io.renren.modules.sys.entity.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -51,6 +53,11 @@ public class SysUserVo {
     private Short status;
 
     /**
+     * 角色ID列表
+     */
+    private List<Long> roleIdList;
+
+    /**
      * 部门id
      */
     private String departmentCode;
@@ -90,5 +97,15 @@ public class SysUserVo {
      */
     private String remarks;
 
+    /**
+     * 创建者ID
+     */
+    private Long createUserId;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
 
 }

renren-fast/src/main/java/io/renren/modules/sys/service/SysUserService.java

@@ -10,7 +10,9 @@ package io.renren.modules.sys.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import io.renren.common.utils.PageUtils;
+import io.renren.modules.app.entity.UserEntity;
 import io.renren.modules.sys.entity.SysUserEntity;
+import io.renren.modules.sys.entity.vo.SysUserVo;
 
 import java.util.List;
 import java.util.Map;
@@ -61,6 +63,15 @@ public interface SysUserService extends IService<SysUserEntity> {
 	 * @param userId       用户ID
 	 * @param password     原密码
 	 * @param newPassword  新密码
+	 * @return
 	 */
 	boolean updatePassword(Long userId, String password, String newPassword);
+
+	/**
+	 * 获取单个用户
+	 * @param sysUserEntity
+	 * @return
+	 */
+    SysUserVo getUserInfo(SysUserEntity sysUserEntity);
+
 }

renren-fast/src/main/java/io/renren/modules/sys/service/impl/SysUserServiceImpl.java

@@ -8,15 +8,23 @@
 
 package io.renren.modules.sys.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import io.renren.common.exception.RRException;
 import io.renren.common.utils.Constant;
 import io.renren.common.utils.PageUtils;
 import io.renren.common.utils.Query;
+import io.renren.modules.app.entity.UserEntity;
+import io.renren.modules.sys.dao.SysDepartmentDao;
+import io.renren.modules.sys.dao.SysJobDao;
 import io.renren.modules.sys.dao.SysUserDao;
+import io.renren.modules.sys.entity.SysDepartmentEntity;
+import io.renren.modules.sys.entity.SysJobEntity;
 import io.renren.modules.sys.entity.SysUserEntity;
 import io.renren.modules.sys.entity.vo.SysUserVo;
 import io.renren.modules.sys.service.SysRoleService;
@@ -46,6 +54,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
     private SysUserRoleService sysUserRoleService;
     @Autowired
     private SysRoleService sysRoleService;
+    @Autowired
+    private SysDepartmentDao sysDepartmentDao;
+    @Autowired
+    private SysJobDao sysJobDao;
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
@@ -170,4 +182,19 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
             throw new RRException("新增用户所选角色，不是本人创建");
         }
     }
+
+    @Override
+    public SysUserVo getUserInfo(SysUserEntity sysUserEntity) {
+        SysUserVo sysUserVo = new SysUserVo();
+        BeanUtil.copyProperties(sysUserEntity,sysUserVo);
+
+        LambdaQueryWrapper<SysDepartmentEntity> deptQuery = Wrappers.lambdaQuery();
+        deptQuery.eq(SysDepartmentEntity::getDepartmentCode, sysUserEntity.getDepartmentCode());
+        sysUserVo.setDepartmentName(sysDepartmentDao.selectOne(deptQuery).getDepartmentName());
+        LambdaQueryWrapper<SysJobEntity> jobQuery = Wrappers.lambdaQuery();
+        jobQuery.eq(SysJobEntity::getJobCode, sysUserEntity.getJobCode());
+        sysUserVo.setJobName(sysJobDao.selectOne(jobQuery).getJobName());
+
+        return sysUserVo;
+    }
 }