Merge branch 'master' of http://gitlab.scsmile.cn/zxf/device-new-platform

device-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthTokenServiceImpl.java

@@ -117,6 +117,11 @@ public class AuthTokenServiceImpl implements IAuthTokenService {
                     cacheService.select(db);
                 } else {
                     userStr = cacheService.get(userKey);
+                    //刷新token时间
+                    UserEntity userEntity = JSONObject.parseObject(userStr, UserEntity.class);
+                    if (!ObjectUtils.isEmpty(userEntity)) {
+                        verifyToken(userEntity);
+                    }
                 }
                 if (StringUtils.isNotEmpty(userStr)) {
                     UserEntity userEntity = JSONObject.parseObject(userStr, UserEntity.class);

device-manager/src/main/java/com/mortals/xhx/base/system/role/web/RoleAuthController.java

@@ -3,20 +3,15 @@ package com.mortals.xhx.base.system.role.web;
 
 import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.role.model.RoleAuthEntity;
 import com.mortals.xhx.base.system.role.model.RoleAuthQuery;
+import com.mortals.xhx.base.system.role.service.RoleAuthService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.mortals.framework.web.BaseCRUDJsonMappingController;
-import com.mortals.xhx.base.system.role.model.RoleAuthEntity;
-import com.mortals.xhx.base.system.role.service.RoleAuthService;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 /**
  * 角色资源权限
  *
@@ -29,7 +24,6 @@ import javax.servlet.http.HttpServletResponse;
 public class RoleAuthController extends BaseCRUDJsonBodyMappingController<RoleAuthService, RoleAuthEntity, Long> {
 
     public RoleAuthController() {
-        super.setFormClass(RoleAuthForm.class);
         super.setModuleDesc("角色资源权限");
     }
 

device-manager/src/main/java/com/mortals/xhx/base/system/role/web/RoleAuthForm.java

-/**
-* 文件：RoleAuthForm.java
-* 版本：1.0.0
-* 日期：
-* Copyright ® 
-* All right reserved.
-*/
-package com.mortals.xhx.base.system.role.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.base.system.role.model.RoleAuthEntity;
-import com.mortals.xhx.base.system.role.model.RoleAuthQuery;
-
-/**
- * <p>Title: 角色资源权限</p>
- * <p>Description: RoleAuthForm  </p>
- * <p>Copyright: Copyright &reg;  </p>
- * <p>Company: </p>
- * @author 
- * @version 1.0.0
- */
-public class RoleAuthForm extends BaseCRUDFormLong<RoleAuthEntity> {
-	private RoleAuthEntity entity = new RoleAuthEntity();
-	private RoleAuthQuery query = new RoleAuthQuery();
-	public RoleAuthForm(){
-		
-	}
-	
-    @Override
-	public RoleAuthEntity getEntity() {
-		return entity;
-	}
-
-	public void setEntity(RoleAuthEntity entity) {
-		this.entity = entity;
-	}
-
-	@Override
-	public RoleAuthQuery getQuery() {
-		return query;
-	}
-
-	public void setQuery(RoleAuthQuery query) {
-		this.query = query;
-	}
-}
\ No newline at end of file

device-manager/src/main/java/com/mortals/xhx/base/system/role/web/RoleController.java

@@ -39,7 +39,6 @@ public class RoleController extends BaseCRUDJsonBodyMappingController<RoleServic
 	private RoleUserService roleUserService;
 	
 	public RoleController(){
-		super.setFormClass(RoleForm.class);
 		super.setModuleDesc("角色信息");
 	}
 

device-manager/src/main/java/com/mortals/xhx/base/system/role/web/RoleForm.java

-/**
-* 文件：RoleForm.java
-* 版本：1.0.0
-* 日期：
-* Copyright ® 
-* All right reserved.
-*/
-package com.mortals.xhx.base.system.role.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.base.system.role.model.RoleEntity;
-import com.mortals.xhx.base.system.role.model.RoleQuery;
-
-/**
- * <p>Title: 角色信息</p>
- * <p>Description: RoleForm  </p>
- * <p>Copyright: Copyright &reg;  </p>
- * <p>Company: </p>
- * @author 
- * @version 1.0.0
- */
-public class RoleForm extends BaseCRUDFormLong<RoleEntity> {
-	private RoleEntity entity = new RoleEntity();
-	private RoleQuery query = new RoleQuery();
-	/** 用户ID */
-	private Long userId;
-	public RoleForm(){
-		
-	}
-	
-    @Override
-	public RoleEntity getEntity() {
-		return entity;
-	}
-
-	public void setEntity(RoleEntity entity) {
-		this.entity = entity;
-	}
-
-	@Override
-	public RoleQuery getQuery() {
-		return query;
-	}
-
-	public void setQuery(RoleQuery query) {
-		this.query = query;
-	}
-
-	public Long getUserId() {
-		return userId;
-	}
-
-	public void setUserId(Long userId) {
-		this.userId = userId;
-	}
-	
-}
\ No newline at end of file

device-manager/src/main/java/com/mortals/xhx/base/system/role/web/RoleUserController.java

@@ -7,26 +7,22 @@ import com.mortals.framework.ap.SysConstains;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.framework.model.Context;
-
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.xhx.base.system.role.model.RoleUserQuery;
-import org.apache.commons.beanutils.MethodUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.mortals.framework.web.BaseCRUDJsonMappingController;
 import com.mortals.xhx.base.system.role.model.RoleEntity;
 import com.mortals.xhx.base.system.role.model.RoleUserEntity;
+import com.mortals.xhx.base.system.role.model.RoleUserQuery;
 import com.mortals.xhx.base.system.role.service.RoleService;
 import com.mortals.xhx.base.system.role.service.RoleUserService;
 import com.mortals.xhx.base.system.user.model.UserEntity;
 import com.mortals.xhx.base.system.user.model.UserQuery;
 import com.mortals.xhx.base.system.user.service.UserService;
+import org.apache.commons.beanutils.MethodUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -49,7 +45,6 @@ public class RoleUserController extends BaseCRUDJsonBodyMappingController<RoleUs
     private UserService userService;
 
     public RoleUserController() {
-        super.setFormClass(RoleUserForm.class);
         super.setModuleDesc("角色用户");
     }
 

device-manager/src/main/java/com/mortals/xhx/base/system/role/web/RoleUserForm.java

-/**
-* 文件：RoleUserForm.java
-* 版本：1.0.0
-* 日期：
-* Copyright ® 
-* All right reserved.
-*/
-package com.mortals.xhx.base.system.role.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.base.system.role.model.RoleUserEntity;
-import com.mortals.xhx.base.system.role.model.RoleUserQuery;
-
-/**
- * <p>Title: 角色用户</p>
- * <p>Description: RoleUserForm  </p>
- * <p>Copyright: Copyright &reg;  </p>
- * <p>Company: </p>
- * @author 
- * @version 1.0.0
- */
-public class RoleUserForm extends BaseCRUDFormLong<RoleUserEntity> {
-	private RoleUserEntity entity = new RoleUserEntity();
-	private RoleUserQuery query = new RoleUserQuery();
-	public RoleUserForm(){
-		
-	}
-	
-    @Override
-	public RoleUserEntity getEntity() {
-		return entity;
-	}
-
-	public void setEntity(RoleUserEntity entity) {
-		this.entity = entity;
-	}
-
-	@Override
-	public RoleUserQuery getQuery() {
-		return query;
-	}
-
-	public void setQuery(RoleUserQuery query) {
-		this.query = query;
-	}
-}
\ No newline at end of file

device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceAlarmInfoController.java

 package com.mortals.xhx.module.device.web;
 
-import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
@@ -51,17 +50,6 @@ public class DeviceAlarmInfoController extends BaseCRUDJsonBodyMappingController
         super.init(model, context);
     }
 
-    @Override
-    @UnAuth
-    public Rest<Object> list(DeviceAlarmInfoEntity query) {
-        return super.list(query);
-    }
-
-    @Override
-    @UnAuth
-    public String info(Long id) {
-        return super.info(id);
-    }
 
     @Override
     protected void doListBefore(DeviceAlarmInfoEntity query, Map<String, Object> model, Context context) throws AppException {

device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java

@@ -83,11 +83,6 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
         super.setModuleDesc("设备");
     }
 
-    @Override
-    @UnAuth
-    public Rest<Object> list(DeviceEntity query) {
-        return super.list(query);
-    }
 
     @Override
     protected void init(Map<String, Object> model, Context context) {

device-manager/src/main/java/com/mortals/xhx/module/site/model/SiteTreeSelect.java

@@ -17,6 +17,8 @@ import com.mortals.xhx.module.area.model.AreaEntity;
 import com.mortals.xhx.module.device.model.DeviceEntity;
 import com.mortals.xhx.module.device.model.DeviceQuery;
 import com.mortals.xhx.module.device.service.DeviceService;
+import com.mortals.xhx.module.sitestat.model.SitestatEntity;
+import com.mortals.xhx.module.sitestat.service.SitestatService;
 import com.mortals.xhx.utils.SpringUtils;
 import lombok.Data;
 import org.springframework.util.ObjectUtils;
@@ -119,6 +121,12 @@ public class SiteTreeSelect implements Serializable {
      */
     private List<SiteTreeSelect> children;
 
+
+    /**
+     * 站点统计id
+     */
+    private Long siteStatId;
+
     public SiteTreeSelect() {
     }
 
@@ -190,6 +198,7 @@ public class SiteTreeSelect implements Serializable {
             if ("site".equals(node.getType())) {
                 //统计当前站点下的所有在线 离线 设备总数。
                 DeviceService deviceService = SpringUtils.getBean(DeviceService.class);
+                SitestatService sitestatService = SpringUtils.getBean(SitestatService.class);
                 List<DeviceEntity> deviceList = deviceService.find(new DeviceQuery().siteId(DataUtil.converStr2Long(node.getId(), -1)));
                 node.setDeviceTotal(deviceList.size());
                 //未激活数量
@@ -211,8 +220,13 @@ public class SiteTreeSelect implements Serializable {
                         .filter(f -> f.getDeviceStatus() == DeviceStatusEnum.离线.getValue())
                         .count();
                 node.setOfflineTotal(deviceOfflineCount.intValue());
-            }
 
+                //设置统计id
+                SitestatEntity sitestatCache = sitestatService.getExtCache(node.getSiteCode());
+                if (!ObjectUtils.isEmpty(sitestatCache)) {
+                    node.setSiteStatId(sitestatCache.getId());
+                }
+            }
             sitePdu.setAreaCode(node.getAreaCode());
             Rest<Integer> rest = siteFeign.countSitesByArea(sitePdu);
             if (rest.getCode() == YesNoEnum.YES.getValue()) {
@@ -220,7 +234,7 @@ public class SiteTreeSelect implements Serializable {
             }
             JSONArray jsonArray = jsonObject.getJSONArray("children");
             List<SiteTreeSelect> children = new ArrayList<>();
-            if(!ObjectUtils.isEmpty(jsonArray)){
+            if (!ObjectUtils.isEmpty(jsonArray)) {
                 for (int i = 0; i < jsonArray.size(); i++) {
                     SiteTreeSelect child = JSON.parseObject(jsonArray.getJSONObject(i).toJSONString(), SiteTreeSelect.class);
                     children.add(child);

device-manager/src/main/java/com/mortals/xhx/module/sitestat/service/SitestatService.java

 package com.mortals.xhx.module.sitestat.service;
+
 import com.mortals.framework.model.Context;
-import com.mortals.framework.service.ICRUDService;
-import com.mortals.xhx.module.device.model.DeviceEntity;
+import com.mortals.framework.service.ICRUDCacheService;
 import com.mortals.xhx.module.sitestat.model.SitestatEntity;
 
-import java.util.List;
-
 /**
 * SitestatService
 *
@@ -14,7 +12,7 @@ import java.util.List;
 * @author zxfei
 * @date 2022-06-27
 */
-public interface SitestatService extends ICRUDService<SitestatEntity,Long>{
+public interface SitestatService extends ICRUDCacheService<SitestatEntity,Long> {
 
 
     String getSiteTree(Context context);

device-manager/src/main/java/com/mortals/xhx/module/sitestat/web/SitestatController.java

@@ -54,6 +54,9 @@ public class SitestatController extends BaseCRUDJsonBodyMappingController<Sitest
     }
 
 
+
+
+
     @Override
     protected void init(Map<String, Object> model, Context context) {
         super.init(model, context);

device-manager/src/test/java/com/mortals/httpclient/device/DeviceController.http

@@ -55,6 +55,15 @@ Content-Type: application/json
   "id": "3"
 }
 
+###设备查看
+POST {{baseUrl}}/device/maplist
+Accept: application/json
+Content-Type: application/json
+
+{
+  "siteId": 1
+}
+
 
 ###设备告警统计查看
 POST {{baseUrl}}/device/alarm/info/stats