企业在线管理修改

src/main/java/com/glxp/api/controller/sup/UserComanyController.java

@@ -1,5 +1,6 @@
 package com.glxp.api.controller.sup;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageInfo;
@@ -15,6 +16,7 @@ import com.glxp.api.req.basic.ProductInfoFilterRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.auth.registComPerResponse;
 import com.glxp.api.res.sup.UserCompanyOnlineResponse;
+import com.glxp.api.res.sup.UserCompanyResponse;
 import com.glxp.api.service.sup.UserCompanyOnlineService;
 import com.glxp.api.service.sup.UserCompanyService;
 import com.glxp.api.util.DateUtil;
@@ -24,6 +26,7 @@ import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -76,6 +79,7 @@ public class UserComanyController extends BaseController {
 
     /**
      * 查询企业账号列表，包含客户端在线状态
+     *
      * @param filterUserComapanyRequest
      * @return
      */
@@ -84,20 +88,36 @@ public class UserComanyController extends BaseController {
     public BaseResponse filterCompanyStaus(FilterUserComapanyRequest filterUserComapanyRequest) {
 
         List<UserCompanyEntity> userCompanyEntities = userCompanyService.filterCompanyName(filterUserComapanyRequest);
-
+        List<UserCompanyResponse> userCompanyResponses = new ArrayList<>();
         if (CollUtil.isNotEmpty(userCompanyEntities)) {
             for (UserCompanyEntity userCompanyEntity : userCompanyEntities) {
+                UserCompanyResponse userCompanyResponse = new UserCompanyResponse();
+                BeanUtil.copyProperties(userCompanyEntity, userCompanyResponse);
+                userCompanyResponse.setRemark(null);
                 UserCompanyOnlineResponse userCompanyOnlineResponse = userCompanyOnlineService.findOnLineByConfig(userCompanyEntity.getId());
-                if (DateUtil.isExpire(userCompanyOnlineResponse.getUpdateTime(), userCompanyOnlineResponse.getHeartRate())) {
-                    userCompanyEntity.setOnLineStatus(2);
-                } else
-                    userCompanyEntity.setOnLineStatus(1);
+                if (userCompanyOnlineResponse == null) {
+                    userCompanyResponse.setOnLineStatus(3);
+                } else {
+                    if (userCompanyOnlineResponse.getUpdateTime() == null) {
+                        userCompanyResponse.setOnLineStatus(3);
+                    } else if (DateUtil.isExpire(userCompanyOnlineResponse.getUpdateTime(), userCompanyOnlineResponse.getHeartRate())) {
+                        userCompanyResponse.setOnLineStatus(2);
+                    } else {
+                        userCompanyResponse.setOnLineStatus(1);
                     }
+                    userCompanyResponse.setUpdateTime(userCompanyOnlineResponse.getUpdateTime());
+                    userCompanyResponse.setHeartRate(userCompanyOnlineResponse.getHeartRate());
+                    userCompanyResponse.setLastIp(userCompanyOnlineResponse.getLastIp());
+                    userCompanyResponse.setRemark(userCompanyOnlineResponse.getRemark());
+                    userCompanyResponse.setUserId(userCompanyOnlineResponse.getUserId());
                 }
-        PageInfo<UserCompanyEntity> pageInfo = new PageInfo<>(userCompanyEntities);
-        PageSimpleResponse<UserCompanyEntity> pageSimpleResponse = new PageSimpleResponse<>();
+                userCompanyResponses.add(userCompanyResponse);
+            }
+        }
+        PageInfo<UserCompanyResponse> pageInfo = new PageInfo<>(userCompanyResponses);
+        PageSimpleResponse<UserCompanyResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
-        pageSimpleResponse.setList(userCompanyEntities);
+        pageSimpleResponse.setList(userCompanyResponses);
         return ResultVOUtils.success(pageSimpleResponse);
     }
 

src/main/java/com/glxp/api/controller/sup/UserCompanyConfigController.java

@@ -1,12 +1,15 @@
 package com.glxp.api.controller.sup;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.entity.sup.UserCompanyConfigEntity;
+import com.glxp.api.req.sup.UserCompanyConfigRequest;
 import com.glxp.api.service.sup.UserCompanyConfigService;
 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.RestController;
 
 import javax.annotation.Resource;
@@ -19,11 +22,22 @@ public class UserCompanyConfigController {
     @Resource
     UserCompanyConfigService userCompanyConfigService;
 
-    //获取企业任务配置
+    //企业登录后获取企业任务配置
     @PostMapping("/admin/user/config/get")
     public BaseResponse heartPost(String companyId) {
         UserCompanyConfigEntity userCompanyConfigEntity = userCompanyConfigService.getOne(new QueryWrapper<UserCompanyConfigEntity>().eq("companyId", companyId));
         return ResultVOUtils.success(userCompanyConfigEntity);
     }
 
+
+    //编辑企业设置
+    @PostMapping("/admin/user/config/update")
+    public BaseResponse updateConfig(@RequestBody UserCompanyConfigRequest userCompanyConfigRequest) {
+        UserCompanyConfigEntity userCompanyConfigEntity = new UserCompanyConfigEntity();
+        BeanUtil.copyProperties(userCompanyConfigRequest, userCompanyConfigEntity);
+        userCompanyConfigService.updateByCompanyId(userCompanyConfigEntity);
+        return ResultVOUtils.success("修改成功！");
+    }
+
+
 }

src/main/java/com/glxp/api/controller/sup/UserOnLineController.java

@@ -6,6 +6,7 @@ import com.glxp.api.entity.sup.UserCompanyOnlineEntity;
 import com.glxp.api.req.sup.UserCompanyOnlineRequest;
 import com.glxp.api.service.sup.UserCompanyOnlineService;
 import com.glxp.api.util.BeanCopyUtils;
+import com.glxp.api.util.IpUtils;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -13,6 +14,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
 
 @Api(tags = "心跳任务接口")
 @RestController
@@ -29,12 +32,13 @@ public class UserOnLineController {
      * @return
      */
     @PostMapping("/admin/user/online/heart")
-    public BaseResponse heartPost(@RequestBody UserCompanyOnlineRequest userCompanyOnlineRequest) {
+    public BaseResponse heartPost(@RequestBody UserCompanyOnlineRequest userCompanyOnlineRequest, HttpServletRequest request) {
         UserCompanyOnlineEntity userCompanyOnlineEntity = new UserCompanyOnlineEntity();
         BeanCopyUtils.copy(userCompanyOnlineRequest, userCompanyOnlineEntity);
+        userCompanyOnlineEntity.setUpdateTime(new Date());
+        userCompanyOnlineEntity.setLastIp(IpUtils.getIpAddr(request));
         userCompanyOnlineService.saveOrUpdate(userCompanyOnlineEntity);
         return ResultVOUtils.success("报告成功！");
     }
 
-
 }

src/main/java/com/glxp/api/controller/sup/UserRegisterController.java

@@ -69,7 +69,6 @@ public class UserRegisterController extends BaseController  {
     private IEmailService iEmailService;
 
 
-
     @PostMapping("/admin/auth/register/getCheckcode")
     public BaseResponse getCheckcode(@RequestBody loginmobileRequest params, HttpSession httpSession) {
         return CaptchaUtils.getCheckcode(params, httpSession);
@@ -132,7 +131,6 @@ public class UserRegisterController extends BaseController  {
             userRegisterEntity.setCheckStatus("0");
         boolean b = false;
         b = userRegisterService.saveOrUpdate(userRegisterEntity);
-
         if (!b) {
             return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
         }
@@ -141,7 +139,6 @@ public class UserRegisterController extends BaseController  {
     }
 
 
-
     //第一次完善信息 插入默认数据
     @GetMapping("/admin/auth/register/insertInitial")
     public BaseResponse insertInitial(String mobile) {
@@ -238,6 +235,8 @@ public class UserRegisterController extends BaseController  {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+    @Resource
+    UserCompanyConfigService userCompanyConfigService;
 
     @PostMapping("/admin/auth/register/NotApproved")
     public BaseResponse NotApproved(@RequestBody registComPerResponse registComPerResponse, BindingResult bindingResult) {
@@ -279,7 +278,11 @@ public class UserRegisterController extends BaseController  {
             iEmailService.sendSimpleMail(id.getXemail(), "测试邮箱", "账号:" + userName + ",密码:" + password);
 
 
-
+//            生产企业任务配置表
+            UserCompanyConfigEntity userCompanyConfigEntity = new UserCompanyConfigEntity();
+            userCompanyConfigEntity.setCompanyId(Long.valueOf(registComPerResponse.getUcId()));
+            userCompanyConfigEntity.setHeartRate(10);
+            userCompanyConfigService.updateByCompanyId(userCompanyConfigEntity);
         }
 
         //修改注册表中的状态 企业状态 操作表中插入记录
@@ -292,12 +295,6 @@ public class UserRegisterController extends BaseController  {
         }
         userCheckEntity.setCreateTime(new Date());
 
-//        userCertSetEntity.setId(IdUtil.getSnowflakeNextId());
-//        userCertSetEntity.setName(registComPerResponse.getName());
-//        userCertSetEntity.setCreateUser(registComPerResponse.getReviewer());
-//        userCertSetEntity.setCreateTime(new Date());
-
-
         userRegisterEntity.setId(Long.valueOf(registComPerResponse.getId()));
         userRegisterEntity.setCheckStatus(registComPerResponse.getCheckStatus());
         userCompanyEntity.setId(Long.valueOf(registComPerResponse.getUcId()));
@@ -342,8 +339,4 @@ public class UserRegisterController extends BaseController  {
     }
 
 
-
-
-
-
 }

src/main/java/com/glxp/api/entity/sup/UserCompanyConfigEntity.java

@@ -12,7 +12,7 @@ import lombok.Data;
 @Data
 @TableName(value = "user_company_config")
 public class UserCompanyConfigEntity implements Serializable {
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     /**
@@ -27,5 +27,12 @@ public class UserCompanyConfigEntity implements Serializable {
     @TableField(value = "heartRate")
     private Integer heartRate;
 
+    /**
+     * 备注
+     */
+    @TableField(value = "remark")
+    private String remark;
+
+
     private static final long serialVersionUID = 1L;
 }

src/main/java/com/glxp/api/entity/sup/UserCompanyEntity.java

@@ -104,12 +104,6 @@ public class UserCompanyEntity implements Serializable {
     @TableField(value = "`reason`")
     private String reason;
 
-    /**
-     * 在线状态  1：在线；2：离线
-     */
-    @ApiModelProperty(value = "在线状态  1：在线；2：离线")
-    @TableField(exist = false)
-    private Integer onLineStatus;
 
     private static final long serialVersionUID = 1L;
 }

src/main/java/com/glxp/api/entity/sup/UserCompanyOnlineEntity.java

@@ -23,5 +23,9 @@ public class UserCompanyOnlineEntity implements Serializable {
     @TableField(value = "updateTime")
     private Date updateTime;
 
+    @TableField(value = "lastIp")
+    private String lastIp;
+
+
     private static final long serialVersionUID = 1L;
 }

src/main/java/com/glxp/api/req/sup/UserCompanyConfigRequest.java

@@ -0,0 +1,27 @@
+package com.glxp.api.req.sup;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+@Data
+public class UserCompanyConfigRequest {
+
+    private Integer id;
+
+    /**
+     * 企业ID
+     */
+    private Long companyId;
+
+    /**
+     * 心跳频率(秒）
+     */
+    private Integer heartRate;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

src/main/java/com/glxp/api/res/sup/UserCompanyOnlineResponse.java

@@ -1,12 +1,16 @@
 package com.glxp.api.res.sup;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.glxp.api.entity.sup.UserCompanyEntity;
 import lombok.Data;
 
 import java.util.Date;
 
 @Data
-public class UserCompanyOnlineResponse {
+public class UserCompanyOnlineResponse extends UserCompanyEntity {
+
+
     private Long companyId;
 
     private Long userId;
@@ -15,4 +19,8 @@ public class UserCompanyOnlineResponse {
 
     private Long heartRate;
 
+    private String lastIp;
+
+    private String remark;
+
 }

src/main/java/com/glxp/api/res/sup/UserCompanyResponse.java

@@ -0,0 +1,26 @@
+package com.glxp.api.res.sup;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.glxp.api.entity.sup.UserCompanyEntity;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class UserCompanyResponse extends UserCompanyEntity {
+
+
+    private Long userId;
+
+    private Date updateTime;
+
+    private Long heartRate;
+    /**
+     * 在线状态  1：在线；2：离线; 3:未注册
+     */
+    private Integer onLineStatus;
+
+    private String lastIp;
+
+    private String remark;
+}

src/main/java/com/glxp/api/service/sup/UserCompanyConfigService.java

@@ -1,10 +1,20 @@
 package com.glxp.api.service.sup;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.glxp.api.dao.sup.UserCompanyConfigMapper;
 import com.glxp.api.entity.sup.UserCompanyConfigEntity;
+
+import javax.annotation.Resource;
+
 @Service
 public class UserCompanyConfigService extends ServiceImpl<UserCompanyConfigMapper, UserCompanyConfigEntity> {
+    @Resource
+    UserCompanyConfigMapper userCompanyConfigMapper;
+
+    public boolean updateByCompanyId(UserCompanyConfigEntity userCompanyConfigEntity) {
+        return saveOrUpdate(userCompanyConfigEntity, new QueryWrapper<UserCompanyConfigEntity>().eq("companyId", userCompanyConfigEntity.getCompanyId()));
+    }
 
 }

src/main/resources/application-dev.yml

@@ -4,9 +4,9 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_cpt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_cpt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
-    password: 123456
+    password: Glxp@6066
     hikari:
       connection-timeout: 60000
       maximum-pool-size: 20

src/main/resources/mybatis/mapper/sup/UserCompanyMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.glxp.api.dao.sup.UserCompanyMapper">
     <select id="filterCompanyName" parameterType="com.glxp.api.req.auth.FilterUserComapanyRequest"
             resultType="com.glxp.api.entity.sup.UserCompanyEntity">
-        SELECT id,companyName
+        SELECT *
         FROM user_company
         <where>
             <if test="companyName != '' and companyName != null">

src/main/resources/mybatis/mapper/sup/UserCompanyOnlineMapper.xml

@@ -3,10 +3,9 @@
 <mapper namespace="com.glxp.api.dao.sup.UserCompanyOnlineMapper">
     <select id="findOnLineByConfig"
             resultType="com.glxp.api.res.sup.UserCompanyOnlineResponse">
-        SELECT user_company_online.*, ucc.heartRate
-        FROM user_company_online
-                     left join user_company_config ucc on user_company_online.companyId = ucc.companyId
-
+        SELECT user_company_online.*, ucc.heartRate, ucc.remark
+        FROM user_company_config ucc
+                     left join user_company_online on user_company_online.companyId = ucc.companyId
         where user_company_online.companyId = #{companyId}
     </select>
 </mapper>