【fix】修改登录逻辑，权限验证模块

huimv-eartag2-platform/huimv-eartag2-admin/src/main/java/com/huimv/eartag2/admin/HuimvEartag2AdminApplication.java

@@ -14,7 +14,7 @@ import org.springframework.context.annotation.Import;
  * @Author : ZhuoNing
  * @Create : 2020-12-25
  **/
-//@Import(InterceptorConfig.class)
+@Import(InterceptorConfig.class)
 @SpringBootApplication
 @MapperScan("com.huimv.eartag2.admin.mapper")
 public class HuimvEartag2AdminApplication {

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

@@ -177,7 +177,7 @@ public class SysAccountMultilevelServiceImpl extends ServiceImpl<SysAccountMulti
 
     @Override
     public Result listById(Integer userId) {
-        if (userId== 1){
+        if (1 ==userId){
             return new Result(ResultCode.SUCCESS,baseFarmMapper.selectList(null));
         }
         SysAccountMultilevel sysAccountMultilevel = accountMultilevelMapper.selectById(userId);

huimv-eartag2-platform/huimv-eartag2-common/src/main/java/com/huimv/eartag2/common/config/InterceptorConfig.java

@@ -21,6 +21,6 @@ public class InterceptorConfig implements WebMvcConfigurer {
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(jwtInterceptor()).
-                excludePathPatterns("/*/my/*");
+                excludePathPatterns("/**/my/*","/*");
     }
 }

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/pojo/pojovo/EartagEartagRegisterVo.java

@@ -56,6 +56,8 @@ public class EartagEartagRegisterVo {
     private Integer act;
     //信号强度
     private Integer signal;
+    private Integer stage;
+
 
 
 

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/impl/EartagEartagRegisterServiceImpl.java

@@ -70,7 +70,7 @@ public class EartagEartagRegisterServiceImpl extends ServiceImpl<EartagEartagReg
         BeanUtil.copyProperties(page,eartagDeviceRegisterVoPage);
 
         Float maxEarTemp = 0F;
-        Float minEarTemp = 0F;
+        Float minEarTemp = 100F;
         for (EartagEartagRegister record : page.getRecords()) {
             EartagEartagRegisterVo eartagDeviceRegisterVo = new EartagEartagRegisterVo();
             BeanUtil.copyProperties(record,eartagDeviceRegisterVo);
@@ -81,6 +81,10 @@ public class EartagEartagRegisterServiceImpl extends ServiceImpl<EartagEartagReg
             eartagDeviceRegisterVo.setEarTemp(earTemp1);
             eartagDeviceRegisterVo.setEnvTemp(eartagData.getEnvTemp1());
             eartagDeviceRegisterVo.setSignal(eartagData.getSignal1());
+            EartagDeviceRegister deviceRegister = eartagDeviceRegisterMapper.selectOne(new QueryWrapper<EartagDeviceRegister>().eq("device_code", record.getBelongDevice()));
+
+
+            eartagDeviceRegisterVo.setStage(deviceRegister.getStage());
 
             maxEarTemp = Math.max(earTemp1,maxEarTemp);
             minEarTemp = Math.min(earTemp1,minEarTemp);
@@ -93,12 +97,12 @@ public class EartagEartagRegisterServiceImpl extends ServiceImpl<EartagEartagReg
         long onCount = this.count(wrapper);
 
         map.put("countOff",allCount-onCount);
-
+        eartagDeviceRegisterVoPage.setRecords(listVo);
         map.put("countOn",onCount);
         map.put("countAll",allCount);
         map.put("maxEarTemp",maxEarTemp);
         map.put("minEarTemp",minEarTemp);
-        map.put("page",page);
+        map.put("page",eartagDeviceRegisterVoPage);
 
         return new Result(ResultCode.SUCCESS,map);
     }