修改报警bug

license/src/main/java/iot/sixiang/license/controller/UserController.java

@@ -13,23 +13,23 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import iot.sixiang.license.entity.Permission;
+import iot.sixiang.license.entity.Report;
 import iot.sixiang.license.entity.User;
 import iot.sixiang.license.entity.UserPermission;
 import iot.sixiang.license.handler.IotLicenseException;
 import iot.sixiang.license.jwt.UserUtils;
 import iot.sixiang.license.log.BusinessType;
 import iot.sixiang.license.log.MyLog;
+import iot.sixiang.license.mapper.UserMapper;
 import iot.sixiang.license.model.BaseResult;
 import iot.sixiang.license.model.PageInfoModel;
 import iot.sixiang.license.model.PageResult;
 import iot.sixiang.license.model.ResResult;
 import iot.sixiang.license.model.dto.AssignUserPermissionDTO;
 import iot.sixiang.license.model.dto.UpdateNotifyDTO;
-import iot.sixiang.license.model.vo.UserDeleteVO;
-import iot.sixiang.license.model.vo.UserDetailVO;
-import iot.sixiang.license.model.vo.UserUpdatePwdVo;
-import iot.sixiang.license.model.vo.UserVo;
+import iot.sixiang.license.model.vo.*;
 import iot.sixiang.license.service.PermissionService;
+import iot.sixiang.license.service.ReportService;
 import iot.sixiang.license.service.UserPermissionService;
 import iot.sixiang.license.service.UserService;
 import iot.sixiang.license.util.CommonUtil;
@@ -45,6 +45,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -68,6 +69,10 @@ public class UserController {
     private PermissionService permissionService;
     @Resource
     private UserPermissionService userPermissionService;
+    @Resource
+    ReportService reportService;
+    @Resource
+    UserMapper userMapper;
 
     @Value("${rsa.private_key}")
     private String PRIVATE_KRY;

license/src/main/resources/mapper/UserMapper.xml

@@ -53,14 +53,14 @@
     </select>
 
     <select id="getUserBySn" resultType="iot.sixiang.license.model.vo.UserInfoVO">
-        SELECT `user`.user_name, `user`.company FROM user
+        SELECT `user`.user_name, `user`.company, `user`.notify FROM user
         INNER JOIN apply on user.user_id = apply.user_id
         INNER JOIN device on device.app_id = apply.app_id
         WHERE device.sn = #{sn}
     </select>
 
     <select id="getRootAccount" resultType="iot.sixiang.license.model.vo.UserInfoVO">
-        SELECT user_name, company FROM `user` WHERE parent IS NULL AND `level` = 1 LIMIT 1
+        SELECT user_name, company, notify FROM `user` WHERE parent IS NULL AND `level` = 1 LIMIT 1
     </select>
 
 </mapper>