更新密码

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/SysAccountMultilevelController.java

@@ -107,4 +107,11 @@ public class SysAccountMultilevelController {
         Integer userId = TokenSign.getMemberIdByJwtToken(request);
         return  accountMultilevelService.getLastFarmId(userId);
     }
+
+
+    @PostMapping("/updatePassword")
+    public Result updatePassword(@RequestBody Map<String,String> map,HttpServletRequest request){
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+        return   accountMultilevelService.updatePassword(map,userId);
+    }
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/service/ISysAccountMultilevelService.java

@@ -5,6 +5,7 @@ import com.huimv.guowei.admin.common.utils.Result;
 import com.huimv.guowei.admin.entity.SysAccountMultilevel;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -30,4 +31,5 @@ public interface ISysAccountMultilevelService extends IService<SysAccountMultile
 
     Result listSubordinateByFarm(String farmId, Integer userId);
 
+    Result updatePassword(Map<String,String> map, Integer userId);
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/SysAccountMultilevelServiceImpl.java

@@ -15,6 +15,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -124,4 +125,24 @@ public class SysAccountMultilevelServiceImpl extends ServiceImpl<SysAccountMulti
         return new Result(ResultCode.SUCCESS,page);
     }
 
+    @Override
+    public Result updatePassword(Map<String,String> map, Integer userId) {
+        String oldPassword = map.get("oldPassword");
+        String newPassword = map.get("newPassword");
+        SysAccountMultilevel user = this.getById(userId);
+        String password = user.getPassword();
+        if(StringUtils.isBlank(oldPassword)||StringUtils.isBlank(newPassword)){
+            return new Result(10001,"密码为空",false);
+        }
+        if(!oldPassword.equals(password)){
+            return new Result(10001,"密码错误",false);
+        }
+        if(!oldPassword.equals(newPassword)){
+            return new Result(10001,"新密码与旧密码一致",false);
+        }
+        SysAccountMultilevel sysAccountMultilevel = user.setPassword(newPassword);
+        this.updateById(sysAccountMultilevel);
+        return new Result(10000,"密码修改成功",true);
+    }
+
 }

input/src/main/java/com/huimv/input/server/EnvInputServerHandler.java

@@ -47,6 +47,9 @@ public class EnvInputServerHandler extends ChannelInboundHandlerAdapter {
     private EnvRegularCallFeedingMapper envRegularCallFeedingMapper;
 
     @Autowired
+    private EnvRegularCallFeedingCopyMapper envRegularCallFeedingCopyMapper;
+
+    @Autowired
     private EnvDeviceMapper envDeviceMapper;
 
     @Autowired
@@ -150,8 +153,30 @@ public class EnvInputServerHandler extends ChannelInboundHandlerAdapter {
 
             //加料
             if (compare>0){
-                envRegularCallFeeding.setEventType(1);
-                envRegularCallFeedingMapper.insert(envRegularCallFeeding);
+
+                EnvRegularCallFeedingCopy envRegularCallFeedingCopy = new EnvRegularCallFeedingCopy();
+                envRegularCallFeedingCopy.setBattery(new BigDecimal(Integer.parseInt(bat, 16)).divide(new BigDecimal(10), 1, BigDecimal.ROUND_HALF_UP).toString());
+                envRegularCallFeedingCopy.setCallDate(thenTime);
+                envRegularCallFeedingCopy.setCallCode(decId+"");
+                envRegularCallFeedingCopy.setCallName(envDevice.getDeviceName());
+                envRegularCallFeedingCopy.setDuckId(baseDuckInfo.getId());
+                envRegularCallFeedingCopy.setDuckNum(baseDuckInfo.getDuckNum());
+                envRegularCallFeedingCopy.setFarmId(baseDuckInfo.getFarmId());
+                envRegularCallFeedingCopy.setUnitId(baseDuckInfo.getUnitId());
+                envRegularCallFeedingCopy.setUnitName(baseDuckInfo.getUnitName());
+                if (weight.compareTo(new BigDecimal(0) )==0){
+                    envRegularCallFeedingCopy.setDuckFeedingOriginal((new BigDecimal(0)));
+                }else {
+                    envRegularCallFeedingCopy.setDuckFeedingOriginal(weight.divide(new BigDecimal(10), 1, BigDecimal.ROUND_HALF_UP) );
+                }
+                if (subtract.compareTo(new BigDecimal(0) )==0){
+                    envRegularCallFeedingCopy.setDuckWeight((new BigDecimal(0)));
+                }else {
+                    envRegularCallFeedingCopy.setDuckWeight(subtract.divide(new BigDecimal(10), 1, BigDecimal.ROUND_HALF_UP) );
+                }
+
+                envRegularCallFeedingCopy.setEventType(1);
+                envRegularCallFeedingCopyMapper.insert(envRegularCallFeedingCopy);
                 lastWeight =weight;
                 continue;
             }
@@ -185,8 +210,10 @@ public class EnvInputServerHandler extends ChannelInboundHandlerAdapter {
             }
 
             int compare0 = subtract.compareTo(new BigDecimal(0));
+            //小于零大于负八十
+            int compare80 = subtract.compareTo(new BigDecimal(-80));
             //吃料
-            if (compare0<=0){
+            if (compare0<0 && compare80 >=0){
                 if (subtract.compareTo(new BigDecimal(0) )==0){
                     envRegularCallFeeding.setDuckWeight((new BigDecimal(0)));
                 }else {
@@ -198,8 +225,29 @@ public class EnvInputServerHandler extends ChannelInboundHandlerAdapter {
                 continue;
             }
             //其它
-            envRegularCallFeeding.setEventType(2);
-            envRegularCallFeedingMapper.insert(envRegularCallFeeding);
+            EnvRegularCallFeedingCopy envRegularCallFeedingCopy = new EnvRegularCallFeedingCopy();
+            envRegularCallFeedingCopy.setBattery(new BigDecimal(Integer.parseInt(bat, 16)).divide(new BigDecimal(10), 1, BigDecimal.ROUND_HALF_UP).toString());
+            envRegularCallFeedingCopy.setCallDate(thenTime);
+            envRegularCallFeedingCopy.setCallCode(decId+"");
+            envRegularCallFeedingCopy.setCallName(envDevice.getDeviceName());
+            envRegularCallFeedingCopy.setDuckId(baseDuckInfo.getId());
+            envRegularCallFeedingCopy.setDuckNum(baseDuckInfo.getDuckNum());
+            envRegularCallFeedingCopy.setFarmId(baseDuckInfo.getFarmId());
+            envRegularCallFeedingCopy.setUnitId(baseDuckInfo.getUnitId());
+            envRegularCallFeedingCopy.setUnitName(baseDuckInfo.getUnitName());
+            if (weight.compareTo(new BigDecimal(0) )==0){
+                envRegularCallFeedingCopy.setDuckFeedingOriginal((new BigDecimal(0)));
+            }else {
+                envRegularCallFeedingCopy.setDuckFeedingOriginal(weight.divide(new BigDecimal(10), 1, BigDecimal.ROUND_HALF_UP) );
+            }
+            if (subtract.compareTo(new BigDecimal(0) )==0){
+                envRegularCallFeedingCopy.setDuckWeight((new BigDecimal(0)));
+            }else {
+                envRegularCallFeedingCopy.setDuckWeight(subtract.divide(new BigDecimal(10), 1, BigDecimal.ROUND_HALF_UP) );
+            }
+
+            envRegularCallFeedingCopy.setEventType(2);
+            envRegularCallFeedingCopyMapper.insert(envRegularCallFeedingCopy);
         }
         }catch (Exception e){
             System.out.println(e);