'移除消息中心相关代码'

service-iot/service-iot-api/src/main/java/com/usky/iot/RemoteMceService.java

@@ -1,22 +0,0 @@
-package com.usky.iot;
-
-import com.usky.common.core.bean.ApiResult;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-/**
- * @author han
- * @date 2024/04/26 14:07
- */
-@FeignClient(contextId = "remoteMceService", value = "service-iot")
-public interface RemoteMceService {
-    /**
-     * 新增消息
-     *
-     * @return 消息结果
-     */
-    @RequestMapping(value = "addMce")
-    ApiResult<Void> addMce(@RequestParam(value = "mceReceive",required = false) String mceReceive);
-}

service-iot/service-iot-api/src/main/java/com/usky/iot/factory/RemoteMceFallbackFactory.java

@@ -1,32 +0,0 @@
-package com.usky.iot.factory;
-
-import com.alibaba.fastjson.JSONObject;
-import com.usky.common.core.bean.ApiResult;
-import com.usky.common.core.exception.FeignBadRequestException;
-import com.usky.iot.RemoteMceService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-
-/**
- * @author han
- * @date 2024/04/02 15:07
- */
-//@Component
-//public class RemoteMceFallbackFactory implements FallbackFactory<RemoteMceService> {
-//    private static final Logger log = LoggerFactory.getLogger(RemoteMceFallbackFactory.class);
-//
-//    @Override
-//    public RemoteMceService create(Throwable throwable)
-//    {
-//        log.error("iot服务调用失败:{}", throwable.getMessage());
-//        return new RemoteMceService()
-//        {
-//            @Override
-//            public ApiResult<Void> addMce(String mceReceive) {
-//                throw new FeignBadRequestException(500,"新增消息异常"+throwable.getMessage());
-//            }
-//        };
-//    }
-//}

service-iot/service-iot-biz/src/main/java/com/usky/iot/constant/constant.java

@@ -1,33 +0,0 @@
-package com.usky.iot.constant;
-
-public class constant {
-    // 微信公众号的 app_id
-    public static final String WE_CHAT_APP_ID = "wx24286e0c45f8da1c";
-    // 微信公众号的 secret
-    public static final String WE_CHAT_SECRET = "d605d3efaaad559a8e6a327870b48ce8";
-    // 微信公众号的 access_token
-    public static final String WE_CHAT_ACCESS_TOKEN = "**********";
-    // 微信公众号code获取地址
-    public static final String WE_CHAT_CODE_URL = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=%s&redirect_uri=%s&response_type=code&scope=%s&state=STATE#wechat_redirect";
-    // 回调地址，获取open_id
-    public static final String WE_CHAT_CALL_BACK_DOMAIN_URL = "http://localhost:9887/weChat/getWeChatOpenId";
-    // 回调域名
-    public static final String call_back_domain = "manager.usky.cn";
-    // 微信公众号的token获取地址
-    public static final String WE_CHAT_ACCESS_TOKEN_URL = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=%s&secret=%s";
-    // 微信公众号消息推送地址
-    public static final String WE_CHAT_REQUEST_URL = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=%s";
-    // 微信公众号推送消息模板id
-    public static final String WE_CHAT_TEMPLATE_ID = "FmrNuMzgh0E8bWg1j8a2R3zTmRarHYtZ72TSzPrF9Iw";
-    // 微信公众号的消息回调地址（这儿可根据业务需求自定义动作，可选）
-    public static final String WE_CHAT_CUSTOMER_CALL_URL = "http://manager.usky.cn/mobile/#/pages/common/textview/index?id=%s";
-    // 微信公众号的主题颜色
-    public static final String WE_CHAT_TOP_COLOR = "#A349A4";
-    // 微信公众号微信用户授权地址
-    public static final String WE_CHAT_AUTHORIZATION_URL = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=%s&secret=%s&code=%s&grant_type=authorization_code";
-    // 微信公众号登录前端部署相对路径
-    public static final String WE_CHAT_LOGIN = "/mobile/#/pages/login";
-    // 微信公众号首页前端部署相对路径
-    public static final String WE_CHAT_INDEX = "/mobile/#/pages/index";
-
-}

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/api/MceControllerApi.java

@@ -1,20 +0,0 @@
-package com.usky.iot.controller.api;
-
-import com.usky.common.core.bean.ApiResult;
-import com.usky.iot.RemoteMceService;
-import com.usky.iot.service.MceReceiveService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-public class MceControllerApi implements RemoteMceService {
-
-    @Autowired
-    private MceReceiveService mceReceiveService;
-
-    @Override
-    public ApiResult<Void> addMce(String mceReceive) {
-        mceReceiveService.add(mceReceive);
-        return ApiResult.success();
-    }
-}

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/api/SysUserControllerApi.java

@@ -1,60 +0,0 @@
-//package com.usky.iot.controller.api;
-//
-//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-//import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-//import com.usky.common.core.bean.ApiResult;
-//import com.usky.common.core.exception.BusinessException;
-//import com.usky.common.core.util.BeanMapperUtils;
-//import com.usky.common.core.util.FileUtils;
-//import com.usky.common.core.util.GlobalUtils;
-//import com.usky.iot.domain.SysUser;
-//import com.usky.iot.service.SysUserService;
-//import com.usky.system.RemoteUserService;
-//import com.usky.system.domain.SysUserVO;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.web.bind.annotation.RestController;
-//import org.springframework.web.multipart.MultipartFile;
-//
-//import java.io.File;
-//import java.io.IOException;
-//import java.util.ArrayList;
-//import java.util.List;
-//import java.util.Optional;
-//
-//@RestController
-//public class SysUserControllerApi implements RemoteUserService {
-//
-//    @Autowired
-//    private SysUserService sysUserService;
-//    @Override
-//    public ApiResult<List<SysUserVO>> getByUserName(String userName) {
-//        LambdaQueryWrapper<SysUser> queryWrapper = Wrappers.lambdaQuery();
-//        queryWrapper.eq(SysUser::getUserName,userName);
-//        return ApiResult.success(BeanMapperUtils.mapList(sysUserService.list(queryWrapper),SysUser.class,SysUserVO.class));
-//    }
-//
-//    @Override
-//    public ApiResult<List<SysUserVO>> add(SysUserVO sysUserVO) {
-//        sysUserService.save(BeanMapperUtils.map(sysUserVO, SysUser.class));
-//        return ApiResult.success(new ArrayList<>());
-//    }
-//
-//    @Override
-//    public ApiResult<String> upload(MultipartFile multipartFile) {
-//        Optional.ofNullable(multipartFile).orElseThrow(() ->  new BusinessException("文件为空"));
-//        String originalFilename = multipartFile.getOriginalFilename();
-//        String newFileName = System.currentTimeMillis() + originalFilename;
-//        File file = FileUtils.getFile(GlobalUtils.getTempBaseDir(), newFileName);
-//        String urlPath = "";
-//        try {
-//            try {
-//                multipartFile.transferTo(file);
-//            } catch (IOException e) {
-//                throw new BusinessException("文件上传失败");
-//            }
-//        } catch (Exception e) {
-//
-//        }
-//        return ApiResult.success(urlPath);
-//    }
-//}

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/MceContentController.java

@@ -1,22 +0,0 @@
-package com.usky.iot.controller.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 消息内容表 前端控制器
- * </p>
- *
- * @author han
- * @since 2024-04-19
- */
-@RestController
-@RequestMapping("/mceContent")
-public class MceContentController {
-
-}
-

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/MceMbuserController.java

@@ -1,21 +0,0 @@
-package com.usky.iot.controller.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 消息中心_移动端注册表 前端控制器
- * </p>
- *
- * @author han
- * @since 2024-04-26
- */
-@Controller
-@RequestMapping("/mceMbuser")
-public class MceMbuserController {
-
-}
-

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/MceReceiveController.java

@@ -1,115 +0,0 @@
-package com.usky.iot.controller.web;
-
-
-import com.usky.common.core.bean.ApiResult;
-import com.usky.common.core.bean.CommonPage;
-import com.usky.iot.domain.MceReceive;
-import com.usky.iot.service.MceReceiveService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-/**
- * <p>
- * 消息接收表 前端控制器
- * </p>
- *
- * @author han
- * @since 2024-04-19
- */
-@RestController
-@RequestMapping("/mceReceive")
-public class MceReceiveController {
-
-    @Autowired
-    private MceReceiveService mceReceiveService;
-
-    /**
-     * 消息列表分页
-     * @param infoTitle  消息标题
-     * @param infoType  消息标题
-     * @param startTime  开始时间
-     * @param endTime  开始时间
-     * @param current      当前页
-     * @param size     每页条数
-     * @return
-     */
-    @GetMapping("/mceList")
-    public ApiResult<CommonPage<Object>> mceList(@RequestParam(value = "infoTitle", required = false) String infoTitle,
-                                                 @RequestParam(value = "infoType", required = false) String infoType,
-                                                        @RequestParam(value = "startTime", required = false) String startTime,
-                                                        @RequestParam(value = "endTime", required = false) String endTime,
-                                                        @RequestParam(value = "current", required = false, defaultValue = "1") Integer current,
-                                                        @RequestParam(value = "size", required = false, defaultValue = "10") Integer size)
-    {
-        return ApiResult.success(mceReceiveService.mceList(infoTitle, infoType,startTime, endTime, current, size));
-    }
-
-    /**
-     * 消息管理
-     * @param infoTitle  消息标题
-     * @param infoType  消息标题
-     * @param startTime  开始时间
-     * @param endTime  开始时间
-     * @param current      当前页
-     * @param size     每页条数
-     * @return
-     */
-    @GetMapping("/mceManageList")
-    public ApiResult<CommonPage<Object>> mceManageList(@RequestParam(value = "infoTitle", required = false) String infoTitle,
-                                                 @RequestParam(value = "infoType", required = false) String infoType,
-                                                 @RequestParam(value = "startTime", required = false) String startTime,
-                                                 @RequestParam(value = "endTime", required = false) String endTime,
-                                                 @RequestParam(value = "current", required = false, defaultValue = "1") Integer current,
-                                                 @RequestParam(value = "size", required = false, defaultValue = "10") Integer size)
-    {
-        return ApiResult.success(mceReceiveService.mceManageList(infoTitle, infoType,startTime, endTime, current, size));
-    }
-
-    /**
-     * 消息管理通过ID查询接口
-     * @param id  消息内容主键ID
-     * @param current      当前页
-     * @param size     每页条数
-     * @return
-     */
-    @GetMapping("/mceManageById")
-    public ApiResult<CommonPage<MceReceive>> mceManageById(@RequestParam(value = "id") Integer id,
-                                                           @RequestParam(value = "current", required = false, defaultValue = "1") Integer current,
-                                                           @RequestParam(value = "size", required = false, defaultValue = "10") Integer size)
-    {
-        return ApiResult.success(mceReceiveService.mceManageById(id,current,size));
-    }
-
-    /**
-     * 消息接收分类统计接口
-     * @return
-     */
-    @GetMapping("/mceReceiveStatic")
-    public ApiResult<Map<String, Object>> mceReceiveStatic()
-    {
-        return ApiResult.success(mceReceiveService.mceReceiveStatic());
-    }
-
-    /**
-     * 已读
-     * @return
-     */
-    @PutMapping
-    ApiResult<Void> updateMceReceive(@RequestBody MceReceive mceReceive){
-        mceReceiveService.updateMceReceive(mceReceive);
-        return ApiResult.success();
-    }
-
-    /**
-     * 消息接收接口
-     * @return
-     */
-    @PostMapping("/mceAdd")
-    ApiResult<Void> add(@RequestBody String mceReceive){
-        mceReceiveService.add(mceReceive);
-        return ApiResult.success();
-    }
-}
-

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/MceSettingController.java

@@ -1,66 +0,0 @@
-package com.usky.iot.controller.web;
-
-
-import com.usky.common.core.bean.ApiResult;
-import com.usky.common.core.bean.CommonPage;
-import com.usky.iot.domain.BaseAlarm;
-import com.usky.iot.domain.MceSetting;
-import com.usky.iot.service.MceSettingService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 消息设置表 前端控制器
- * </p>
- *
- * @author han
- * @since 2024-04-19
- */
-@RestController
-@RequestMapping("/mceSetting")
-public class MceSettingController {
-
-    @Autowired
-    private MceSettingService mceSettingService;
-
-    /**
-     * 消息设置回显
-     * @return
-     */
-    @GetMapping("/mceSettingInfo")
-    public ApiResult<Map<String, Object>> mceSettingInfo(){
-        return ApiResult.success(mceSettingService.mceSettingInfo());
-    }
-
-    /**
-     * 消息设置列表
-     * @param createBy     创建人
-     * @param current      当前页
-     * @param size     每页条数
-     * @return
-     */
-    @GetMapping("/mceSettingList")
-    public ApiResult<CommonPage<Map<String, Object>>> mceSettingList(@RequestParam(value = "createBy", required = false) String createBy,
-                                                                     @RequestParam(value = "current", required = false, defaultValue = "1") Integer current,
-                                                                     @RequestParam(value = "size", required = false, defaultValue = "10") Integer size){
-        return ApiResult.success(mceSettingService.mceSettingList(createBy,current,size));
-    }
-
-    /**
-     * 新增、修改
-     * @param mceSetting
-     * @return
-     */
-    @PostMapping("/addMceSetting")
-    public ApiResult<Void> add(@RequestBody MceSetting mceSetting){
-        mceSettingService.add(mceSetting);
-        return ApiResult.success();
-    }
-}
-

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/MceContent.java

@@ -1,80 +0,0 @@
-package com.usky.iot.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 消息内容表
- * </p>
- *
- * @author han
- * @since 2024-04-19
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class MceContent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键ID
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 消息标题
-     */
-    private String infoTitle;
-
-    /**
-     * 消息内容
-     */
-    private String infoContent;
-
-    /**
-     * 消息类型
-     */
-    private String infoType;
-
-    /**
-     * 租户号
-     */
-    private Integer tenantId;
-
-    /**
-     * 组织机构ID
-     */
-    private Integer deptId;
-
-    /**
-     * 创建人
-     */
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime createTime;
-
-    /**
-     * 更新人
-     */
-    private String updateBy;
-
-    /**
-     * 更新时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime updateTime;
-
-
-}

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/MceMbuser.java

@@ -1,68 +0,0 @@
-package com.usky.iot.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 消息中心_移动端注册表
- * </p>
- *
- * @author han
- * @since 2024-04-26
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class MceMbuser implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 电话号码
-     */
-    private String phone;
-
-    /**
-     * 微信用户id
-     */
-    private String openid;
-
-    /**
-     * 用户ID
-     */
-    private Long userId;
-
-    /**
-     * 应用ID
-     */
-    private String cids;
-
-    /**
-     * 创建人
-     */
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更新人
-     */
-    private String updateBy;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
-
-
-}

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/MceReceive.java

@@ -1,95 +0,0 @@
-package com.usky.iot.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 消息接收表
- * </p>
- *
- * @author han
- * @since 2024-04-19
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class MceReceive implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键ID
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 接收人ID
-     */
-    private Integer receiverId;
-
-    /**
-     * 接收人
-     */
-    private String receiverName;
-
-    /**
-     * 消息类型
-     */
-    private String infoType;
-
-    /**
-     * 是否已读;0、未读，1、已读
-     */
-    private Integer readFlag;
-
-    /**
-     * 消息内容ID
-     */
-    private Integer contentId;
-
-    /**
-     * 子模块记录ID
-     */
-    private Integer moduleId;
-
-    /**
-     * 租户号
-     */
-    private Integer tenantId;
-
-    /**
-     * 组织机构ID
-     */
-    private Integer deptId;
-
-    /**
-     * 创建人
-     */
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime createTime;
-
-    /**
-     * 更新人
-     */
-    private String updateBy;
-
-    /**
-     * 更新时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime updateTime;
-
-
-}

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/MceSetting.java

@@ -1,80 +0,0 @@
-package com.usky.iot.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 消息设置表
- * </p>
- *
- * @author han
- * @since 2024-04-19
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class MceSetting implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键ID
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * APP通知方式
-     */
-    private String appMode;
-
-    /**
-     * PC端通知方式
-     */
-    private String pcMode;
-
-    /**
-     * 微信端通知方式
-     */
-    private String wcMode;
-
-    /**
-     * 租户号
-     */
-    private Integer tenantId;
-
-    /**
-     * 组织机构ID
-     */
-    private Integer deptId;
-
-    /**
-     * 创建人
-     */
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime createTime;
-
-    /**
-     * 更新人
-     */
-    private String updateBy;
-
-    /**
-     * 更新时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime updateTime;
-
-
-}

service-iot/service-iot-biz/src/main/java/com/usky/iot/mapper/MceContentMapper.java

@@ -1,16 +0,0 @@
-package com.usky.iot.mapper;
-
-import com.usky.iot.domain.MceContent;
-import com.usky.common.mybatis.core.CrudMapper;
-
-/**
- * <p>
- * 消息内容表 Mapper 接口
- * </p>
- *
- * @author han
- * @since 2024-04-19
- */
-public interface MceContentMapper extends CrudMapper<MceContent> {
-
-}

service-iot/service-iot-biz/src/main/java/com/usky/iot/mapper/MceMbuserMapper.java

@@ -1,16 +0,0 @@
-package com.usky.iot.mapper;
-
-import com.usky.iot.domain.MceMbuser;
-import com.usky.common.mybatis.core.CrudMapper;
-
-/**
- * <p>
- * 消息中心_移动端注册表 Mapper 接口
- * </p>
- *
- * @author han
- * @since 2024-04-26
- */
-public interface MceMbuserMapper extends CrudMapper<MceMbuser> {
-
-}

service-iot/service-iot-biz/src/main/java/com/usky/iot/mapper/MceReceiveMapper.java

@@ -1,16 +0,0 @@
-package com.usky.iot.mapper;
-
-import com.usky.iot.domain.MceReceive;
-import com.usky.common.mybatis.core.CrudMapper;
-
-/**
- * <p>
- * 消息接收表 Mapper 接口
- * </p>
- *
- * @author han
- * @since 2024-04-19
- */
-public interface MceReceiveMapper extends CrudMapper<MceReceive> {
-
-}

service-iot/service-iot-biz/src/main/java/com/usky/iot/mapper/MceSettingMapper.java

@@ -1,16 +0,0 @@
-package com.usky.iot.mapper;
-
-import com.usky.iot.domain.MceSetting;
-import com.usky.common.mybatis.core.CrudMapper;
-
-/**
- * <p>
- * 消息设置表 Mapper 接口
- * </p>
- *
- * @author han
- * @since 2024-04-19
- */
-public interface MceSettingMapper extends CrudMapper<MceSetting> {
-
-}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/MceContentService.java

@@ -1,17 +0,0 @@
-package com.usky.iot.service;
-
-import com.alibaba.fastjson.JSONObject;
-import com.usky.iot.domain.MceContent;
-import com.usky.common.mybatis.core.CrudService;
-
-/**
- * <p>
- * 消息内容表 服务类
- * </p>
- *
- * @author han
- * @since 2024-04-19
- */
-public interface MceContentService extends CrudService<MceContent> {
-    void sendApp(JSONObject mceReceiveVO, String cids, Integer mceReceiveId, Integer sendType);
-}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/MceMbuserService.java

@@ -1,24 +0,0 @@
-package com.usky.iot.service;
-
-import com.alibaba.fastjson.JSONObject;
-import com.usky.iot.domain.MceMbuser;
-import com.usky.common.mybatis.core.CrudService;
-import com.usky.iot.service.vo.SendWeChatMessageRequestVO;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * <p>
- * 消息中心_移动端注册表 服务类
- * </p>
- *
- * @author han
- * @since 2024-04-26
- */
-public interface MceMbuserService extends CrudService<MceMbuser> {
-
-    /**
-     * 微信消息提醒
-     * @return
-     */
-    JSONObject sendWeChatMessage(SendWeChatMessageRequestVO requestVO);
-}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/MceReceiveService.java

@@ -1,35 +0,0 @@
-package com.usky.iot.service;
-
-import com.alibaba.fastjson.JSONObject;
-import com.google.gson.JsonObject;
-import com.usky.common.core.bean.CommonPage;
-import com.usky.iot.domain.BaseBuild;
-import com.usky.iot.domain.DmpDeviceInfo;
-import com.usky.iot.domain.MceReceive;
-import com.usky.common.mybatis.core.CrudService;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 消息接收表 服务类
- * </p>
- *
- * @author han
- * @since 2024-04-19
- */
-public interface MceReceiveService extends CrudService<MceReceive> {
-
-    CommonPage<Object> mceList(String infoTitle, String infoType, String startTime, String endTime, Integer current, Integer size);
-
-    CommonPage<Object> mceManageList(String infoTitle, String infoType, String startTime, String endTime, Integer current, Integer size);
-
-    CommonPage<MceReceive> mceManageById(Integer id, Integer current, Integer size);
-
-    Map<String, Object> mceReceiveStatic();
-
-    void updateMceReceive(MceReceive mceReceive);
-
-    void add(String mceReceive);
-}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/MceSettingService.java

@@ -1,24 +0,0 @@
-package com.usky.iot.service;
-
-import com.usky.common.core.bean.CommonPage;
-import com.usky.iot.domain.MceSetting;
-import com.usky.common.mybatis.core.CrudService;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 消息设置表 服务类
- * </p>
- *
- * @author han
- * @since 2024-04-19
- */
-public interface MceSettingService extends CrudService<MceSetting> {
-    void add(MceSetting mceSetting);
-
-    Map<String, Object> mceSettingInfo();
-
-    CommonPage<Map<String, Object>> mceSettingList(String createBy,Integer current, Integer size);
-}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/MceContentServiceImpl.java

@@ -1,52 +0,0 @@
-package com.usky.iot.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.google.gson.JsonObject;
-import com.usky.iot.domain.MceContent;
-import com.usky.iot.mapper.MceContentMapper;
-import com.usky.iot.service.MceContentService;
-import com.usky.common.mybatis.core.AbstractCrudService;
-import com.usky.iot.service.MceMbuserService;
-import com.usky.iot.service.config.HttpClientUtils;
-import com.usky.iot.service.vo.SendWeChatMessageRequestVO;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 消息内容表 服务实现类
- * </p>
- *
- * @author han
- * @since 2024-04-19
- */
-@Slf4j
-@Service
-public class MceContentServiceImpl extends AbstractCrudService<MceContentMapper, MceContent> implements MceContentService {
-
-    @Autowired
-    private MceMbuserService mceMbuserService;
-
-    //异步多线程调用
-    @Async("asyncServiceExecutor")
-    public void sendApp(JSONObject mceReceiveVO, String cids,Integer mceReceiveId, Integer sendType){
-        if (sendType.equals(0)){
-            String appUrl = "https://fc-mp-85a26092-1305-4bf1-998f-b609512c8f7b.next.bspapp.com/uniPushMessage";
-            JsonObject jsonObject = new JsonObject();
-            jsonObject.addProperty("cids", cids);
-            jsonObject.addProperty("title", mceReceiveVO.get("infoTitle").toString());
-            jsonObject.addProperty("content", mceReceiveVO.get("infoContent").toString());
-            String resultString = HttpClientUtils.doPostJson(appUrl,jsonObject.toString());
-        }else if (sendType.equals(1)){
-            SendWeChatMessageRequestVO sendWeChatMessageRequestVO = new SendWeChatMessageRequestVO();
-            sendWeChatMessageRequestVO.setInfoContent(mceReceiveVO.get("infoContent").toString());
-            sendWeChatMessageRequestVO.setInfoTitle(mceReceiveVO.get("infoTitle").toString());
-            sendWeChatMessageRequestVO.setInfoId(mceReceiveId);
-            sendWeChatMessageRequestVO.setOpenId(cids);
-            sendWeChatMessageRequestVO.setInfoType(mceReceiveVO.get("infoType").toString());
-            mceMbuserService.sendWeChatMessage(sendWeChatMessageRequestVO);
-        }
-    }
-}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/MceMbuserServiceImpl.java

@@ -1,137 +0,0 @@
-package com.usky.iot.service.impl;
-
-import cn.hutool.http.HttpUtil;
-import cn.hutool.json.JSONUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.usky.common.core.exception.BusinessException;
-import com.usky.common.redis.core.RedisHelper;
-import com.usky.iot.constant.constant;
-import com.usky.iot.domain.MceMbuser;
-import com.usky.iot.mapper.MceMbuserMapper;
-import com.usky.iot.service.MceMbuserService;
-import com.usky.common.mybatis.core.AbstractCrudService;
-import com.usky.iot.service.vo.SendWeChatMessageRequestVO;
-import com.usky.iot.service.vo.TemplateData;
-import com.usky.iot.service.vo.TemplateMsgEntityVO;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.client.RestTemplate;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * <p>
- * 消息中心_移动端注册表 服务实现类
- * </p>
- *
- * @author han
- * @since 2024-04-26
- */
-@Service
-@Slf4j
-public class MceMbuserServiceImpl extends AbstractCrudService<MceMbuserMapper, MceMbuser> implements MceMbuserService {
-
-    @Autowired
-    private RedisHelper redisHelper;
-
-    public String getWeChatAccessToken() {
-        try {
-            // 微信公众号官方获取AccessToken
-            RestTemplate restTemplate = new RestTemplate();
-            String requestParams = String.format(constant.WE_CHAT_ACCESS_TOKEN_URL, constant.WE_CHAT_APP_ID, constant.WE_CHAT_SECRET);
-            ResponseEntity<String> responseEntity = restTemplate.getForEntity(requestParams, String.class);
-
-            String accessToken = JSONObject.parseObject(responseEntity.getBody()).getString("access_token");
-            log.info("we_chat_access_token: " + accessToken);
-
-            return accessToken;
-        } catch (Exception e) {
-            log.info("异常信息:{}", e);
-        }
-        return null;
-    }
-
-    public static long getTimeDifference(String oldTime,String newTime) throws ParseException {
-
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        long NTime =df.parse(newTime).getTime();
-        //从对象中拿到时间
-        long OTime = df.parse(oldTime).getTime();
-        long diff=(NTime-OTime)/1000/60;
-        return diff;
-    }
-
-    @Override
-    public JSONObject sendWeChatMessage(@RequestBody SendWeChatMessageRequestVO requestVO) {
-
-        String infoType = requestVO.getInfoType();
-        String infoTitle = requestVO.getInfoTitle();
-        String infoContent = requestVO.getInfoContent();
-        Integer infoId = requestVO.getInfoId();
-        String openId = requestVO.getOpenId();
-
-        //access_token时效校验，判断获取access_token获取时间是否超过有效时间，超过就调用更新，保证一直有效
-        if(!redisHelper.hasKey("access_key")){
-            redisHelper.set("access_time", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            redisHelper.set("access_key",this.getWeChatAccessToken());
-        }else{
-            try{
-                String access_time = redisHelper.get("access_time").toString();
-                String now_time = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-                long i = getTimeDifference(access_time,now_time);
-                if(i > 115){ //大于115分钟
-                    redisHelper.set("access_time",LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-                    redisHelper.set("access_key",this.getWeChatAccessToken());
-                }
-            }catch (Exception e){
-                throw new BusinessException(e.getMessage());
-            }
-
-        }
-
-        Object obj = redisHelper.get("access_key");
-        if(obj == null){
-            throw new BusinessException("token不能为空");
-        }
-
-        String token = obj.toString();
-
-        TemplateMsgEntityVO messageVo=new TemplateMsgEntityVO();
-        messageVo.setTTitle(infoTitle);
-        messageVo.setTKeyword1(infoContent);
-//        messageVo.setTKeyword2("测试2");
-//        messageVo.setTKeyword3("测试3");
-        messageVo.setTRemark(infoContent);
-        messageVo.setTUrl(String.format(constant.WE_CHAT_CUSTOMER_CALL_URL,infoId));
-        messageVo.setTemplateId(constant.WE_CHAT_TEMPLATE_ID);
-
-        String requestUrl = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token="  + token;
-        Map<String,Object> content=new HashMap<>();
-        Map<String, TemplateData> data = new HashMap<>();
-        data.put("first",new TemplateData(messageVo.getTTitle(),"#44b549"));
-        data.put("keyword1",new TemplateData(messageVo.getTKeyword1(),"#173177"));
-//        data.put("keyword2",new TemplateData(messageVo.getTKeyword2(),"#173177"));
-//        data.put("keyword3",new TemplateData(messageVo.getTKeyword3(),"#173177"));
-        data.put("remark",new TemplateData(messageVo.getTRemark(),"#173177"));
-
-        content.put("touser",openId);
-        content.put("url",messageVo.getTUrl());
-        content.put("template_id",messageVo.getTemplateId());
-        content.put("data",data);
-        String resp = HttpUtil.post(requestUrl, JSONUtil.parseObj(content).toString());
-        System.out.println(content.toString());
-        System.out.println(JSONUtil.parseObj(content));
-        JSONObject result = JSONObject.parseObject(resp);
-        System.out.println("发送消息:" + resp);
-        return result;
-    }
-}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/MceReceiveServiceImpl.java

@@ -1,283 +0,0 @@
-package com.usky.iot.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.gson.JsonObject;
-import com.usky.common.core.bean.ApiResult;
-import com.usky.common.core.bean.CommonPage;
-import com.usky.common.security.utils.SecurityUtils;
-import com.usky.iot.domain.MceContent;
-import com.usky.iot.domain.MceMbuser;
-import com.usky.iot.domain.MceReceive;
-import com.usky.iot.domain.MceSetting;
-import com.usky.iot.mapper.MceReceiveMapper;
-import com.usky.iot.service.MceContentService;
-import com.usky.iot.service.MceMbuserService;
-import com.usky.iot.service.MceReceiveService;
-import com.usky.common.mybatis.core.AbstractCrudService;
-import com.usky.iot.service.MceSettingService;
-import com.usky.iot.service.config.HttpClientUtils;
-import com.usky.system.RemoteUserService;
-import com.usky.system.domain.SysUser;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Service;
-
-import java.time.LocalDateTime;
-import java.util.*;
-
-/**
- * <p>
- * 消息接收表 服务实现类
- * </p>
- *
- * @author han
- * @since 2024-04-19
- */
-@Service
-public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper, MceReceive> implements MceReceiveService {
-
-    @Autowired
-    private MceContentService mceContentService;
-
-    @Autowired
-    private MceMbuserService mceMbuserService;
-
-    @Autowired
-    private RemoteUserService remoteUserService;
-
-    @Autowired
-    private MceSettingService mceSettingService;
-
-    @Override
-    public CommonPage<Object> mceList(String infoTitle, String infoType, String startTime, String endTime, Integer current, Integer size) {
-        List<Object> list = new ArrayList<>();
-        LambdaQueryWrapper<MceContent> lambdaQuery1 = Wrappers.lambdaQuery();
-        lambdaQuery1.select(MceContent::getId, MceContent::getInfoTitle, MceContent::getInfoContent)
-                .like(StringUtils.isNotBlank(infoTitle),MceContent::getInfoTitle,infoTitle);
-        List<MceContent> list1 = mceContentService.list(lambdaQuery1);
-        IPage<MceReceive> page = new Page<>(current, size);
-        List<Integer> contentIds = new ArrayList<>();
-        if (CollectionUtils.isNotEmpty(list1)){
-            for(int i=0;i<list1.size();i++){
-                contentIds.add(list1.get(i).getId());
-            }
-            LambdaQueryWrapper<MceReceive> lambdaQuery = Wrappers.lambdaQuery();
-            lambdaQuery.select(MceReceive::getId, MceReceive::getInfoType,
-                    MceReceive::getContentId, MceReceive::getReadFlag, MceReceive::getCreateTime,
-                    MceReceive::getReceiverId,MceReceive::getModuleId)
-                    .between(StringUtils.isNotBlank(startTime)&&StringUtils.isNotBlank(endTime),MceReceive::getCreateTime,
-                            startTime,endTime)
-                    .eq(StringUtils.isNotBlank(infoType),MceReceive::getInfoType, infoType)
-                    .eq(MceReceive::getReceiverId, SecurityUtils.getUserId())
-                    .in(CollectionUtils.isNotEmpty(contentIds),MceReceive::getContentId,contentIds)
-                    .orderByDesc(MceReceive::getId);
-//                .inSql(StringUtils.isNotBlank(infoTitle),MceReceive::getContentId,"SELECT id FROM mce_content WHERE " +
-//                        "info_title like '%" + infoTitle + "%' AND tenant_id = "+SecurityUtils.getTenantId()+"");
-            page = this.page(page,lambdaQuery);
-            if (CollectionUtils.isNotEmpty(page.getRecords())) {
-                for (int i = 0; i < page.getRecords().size(); i++) {
-                    Map<String, Object> map = new HashMap<>();
-                    map.put("id", page.getRecords().get(i).getId());
-                    map.put("infoType", page.getRecords().get(i).getInfoType());
-                    map.put("readFlag", page.getRecords().get(i).getReadFlag());
-                    map.put("moduleId", page.getRecords().get(i).getModuleId());
-                    map.put("createTime", page.getRecords().get(i).getCreateTime());
-                    if (CollectionUtils.isNotEmpty(list1)) {
-                        for (int j = 0; j < list1.size(); j++) {
-                            if (page.getRecords().get(i).getContentId().equals(list1.get(j).getId())) {
-                                map.put("infoTitle", list1.get(j).getInfoTitle());
-                                map.put("infoContent", list1.get(j).getInfoContent());
-                            }
-                        }
-                    }
-                    list.add(map);
-                }
-            }
-        }
-        return new CommonPage<>(list,page.getTotal(),page.getCurrent(),page.getSize());
-    }
-
-    @Override
-    public CommonPage<Object> mceManageList(String infoTitle, String infoType, String startTime, String endTime, Integer current, Integer size) {
-        List<Object> list = new ArrayList<>();
-        IPage<MceContent> page = new Page<>(current, size);
-        LambdaQueryWrapper<MceContent> lambdaQuery1 = Wrappers.lambdaQuery();
-        lambdaQuery1.select(MceContent::getId, MceContent::getInfoTitle, MceContent::getInfoContent,
-                MceContent::getCreateTime,MceContent::getInfoType)
-                .like(StringUtils.isNotBlank(infoTitle),MceContent::getInfoTitle,infoTitle)
-                .between(StringUtils.isNotBlank(startTime)&&StringUtils.isNotBlank(endTime),MceContent::getCreateTime,
-                        startTime,endTime)
-                .eq(StringUtils.isNotBlank(infoType),MceContent::getInfoType, infoType)
-                .eq(MceContent::getCreateBy,SecurityUtils.getUsername())
-                .eq(MceContent::getTenantId,SecurityUtils.getTenantId());
-        page = mceContentService.page(page,lambdaQuery1);
-        if (CollectionUtils.isNotEmpty(page.getRecords())) {
-            List<Integer> contentIds = new ArrayList<>();
-            for (int i = 0; i < page.getRecords().size(); i++) {
-                contentIds.add(page.getRecords().get(i).getId());
-            }
-            QueryWrapper<MceReceive> queryWrapper = Wrappers.query();
-            queryWrapper.select("content_id AS contentId","COUNT(read_flag=0 or null) as notReadCount","COUNT(read_flag=1 or null) as readCount")
-                    .in("content_id",contentIds)
-                    .groupBy("content_id");
-            List<Map<String,Object>> readStatisticList = this.listMaps(queryWrapper);
-            for (int i = 0; i < page.getRecords().size(); i++) {
-                Map<String, Object> map = new HashMap<>();
-                map.put("id", page.getRecords().get(i).getId());
-                map.put("infoTitle", page.getRecords().get(i).getInfoTitle());
-                map.put("infoContent", page.getRecords().get(i).getInfoContent());
-                map.put("infoType", page.getRecords().get(i).getInfoType());
-                map.put("createTime", page.getRecords().get(i).getCreateTime());
-                for (int j = 0; j < readStatisticList.size(); j++) {
-                    if (page.getRecords().get(i).getId().equals(readStatisticList.get(j).get("contentId"))){
-                        map.put("notReadCount", readStatisticList.get(j).get("notReadCount"));
-                        map.put("readCount", readStatisticList.get(j).get("readCount"));
-                    }
-                }
-                list.add(map);
-            }
-        }
-        return new CommonPage<>(list,page.getTotal(),page.getCurrent(),page.getSize());
-    }
-
-    @Override
-    public CommonPage<MceReceive> mceManageById(Integer id, Integer current, Integer size) {
-        IPage<MceReceive> page = new Page<>(current, size);
-        LambdaQueryWrapper<MceReceive> lambdaQuery = Wrappers.lambdaQuery();
-        lambdaQuery.eq(MceReceive::getContentId,id);
-        page = this.page(page,lambdaQuery);
-//        if (CollectionUtils.isNotEmpty(page.getRecords())) {
-//            List<Integer> userIds = new ArrayList<>();
-//            for (int i = 0; i < page.getRecords().size(); i++) {
-//                userIds.add(page.getRecords().get(i).getReceiverId());
-//            }
-//            List<Integer> distinctUserIds = userIds.stream()
-//                    .distinct()
-//                    .collect(Collectors.toList());
-//            ApiResult<List<SysUser>> userApi = remoteUserService.userByIdList(distinctUserIds);
-//            List<SysUser> list1 = userApi.getData();
-//            for (int j = 0; j < page.getRecords().size(); j++) {
-//                if (CollectionUtils.isNotEmpty(list1)){
-//                    for (int k = 0; k < list1.size(); k++) {
-//                        long longValue = list1.get(k).getUserId();
-//                        Integer intValue = (int) longValue;
-//                        if (page.getRecords().get(j).getReceiverId().equals(intValue)){
-//                            page.getRecords().get(j).setUpdateBy(list1.get(k).getUserName());
-//                        }
-//                    }
-//                }
-//            }
-//        }
-        return new CommonPage<>(page.getRecords(),page.getTotal(),page.getCurrent(),page.getSize());
-    }
-
-    @Override
-    public Map<String, Object> mceReceiveStatic() {
-        LocalDateTime currentDate = LocalDateTime.now();
-        LocalDateTime oneYearAgo = currentDate.minusYears(1);
-        LocalDateTime zeroTime = oneYearAgo.withHour(0).withMinute(0).withSecond(0);
-        QueryWrapper<MceReceive> queryWrapper = Wrappers.query();
-        queryWrapper.select("COUNT(read_flag=0 or null) as notReadCount","COUNT(read_flag=1 or null) as readCount"
-                ,"info_type AS infoType")
-                .eq("receiver_id",SecurityUtils.getUserId())
-                .between("create_time",zeroTime,currentDate)
-                .groupBy("info_type");
-        List<Map<String,Object>> readStatisticList = this.listMaps(queryWrapper);
-        LambdaQueryWrapper<MceReceive> lambdaQuery = Wrappers.lambdaQuery();
-        lambdaQuery.eq(MceReceive::getReceiverId,SecurityUtils.getUserId())
-                .eq(MceReceive::getReadFlag,0);
-        Integer notReadCount = this.count(lambdaQuery);
-        Map<String, Object> map = new HashMap<>();
-        map.put("notReadCount", notReadCount);
-        map.put("infoTypeStatic", readStatisticList);
-        return map;
-    }
-
-    @Override
-    public void updateMceReceive(MceReceive mceReceive){
-        LambdaUpdateWrapper<MceReceive> updateWrapper = new UpdateWrapper<MceReceive>().lambda();
-        if (Objects.nonNull(mceReceive.getId())&&!mceReceive.getId().equals(0)){
-            updateWrapper.eq(MceReceive::getId,mceReceive.getId())
-                    .set(MceReceive::getReadFlag,1)
-                    .set(MceReceive::getUpdateBy,SecurityUtils.getUsername())
-                    .set(MceReceive::getUpdateTime,LocalDateTime.now());
-        }else {
-            updateWrapper.eq(MceReceive::getReceiverId,SecurityUtils.getUserId())
-                    .eq(MceReceive::getReadFlag,0)
-                    .set(MceReceive::getReadFlag,1)
-                    .set(MceReceive::getUpdateBy,SecurityUtils.getUsername())
-                    .set(MceReceive::getUpdateTime,LocalDateTime.now());
-        }
-        this.update(updateWrapper);
-    }
-
-    @Override
-    public void add(String mceReceive){
-        JSONObject mceReceiveVO = JSONObject.parseObject(mceReceive);
-        MceContent mceContent = new MceContent();
-        mceContent.setInfoTitle(mceReceiveVO.get("infoTitle").toString());
-        mceContent.setInfoContent(mceReceiveVO.get("infoContent").toString());
-        mceContent.setInfoType(mceReceiveVO.get("infoType").toString());
-        mceContent.setCreateBy(SecurityUtils.getUsername());
-        mceContent.setCreateTime(LocalDateTime.now());
-//        mceContent.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId().intValue());
-
-        mceContent.setTenantId(SecurityUtils.getTenantId());
-        mceContentService.save(mceContent);
-        Integer contentId = mceContent.getId();
-        ApiResult<List<SysUser>> userAllList = remoteUserService.userAllList();
-        List<SysUser> list = userAllList.getData();
-        if (CollectionUtils.isNotEmpty(list)) {
-            List<Integer> userIds = new ArrayList<>();
-            for (int g = 0; g < list.size(); g++) {
-                userIds.add(list.get(g).getUserId().intValue());
-            }
-            LambdaQueryWrapper<MceMbuser> lambdaQuery3 = Wrappers.lambdaQuery();
-            lambdaQuery3.in(MceMbuser::getUserId,userIds);
-            List<MceMbuser> list3 = mceMbuserService.list(lambdaQuery3);
-            for (int i = 0; i < list.size(); i++) {
-                MceReceive mceReceive1 = new MceReceive();
-                mceReceive1.setReceiverId(list.get(i).getUserId().intValue());
-                mceReceive1.setContentId(contentId);
-                mceReceive1.setReadFlag(0);
-                mceReceive1.setInfoType(mceReceiveVO.get("infoType").toString());
-                mceReceive1.setModuleId((int)mceReceiveVO.get("id"));
-                mceReceive1.setReceiverName(list.get(i).getUserName());
-                mceReceive1.setCreateBy(SecurityUtils.getUsername());
-                mceReceive1.setCreateTime(LocalDateTime.now());
-                mceReceive1.setTenantId(list.get(i).getTenantId());
-//                mceReceive1.setDeptId(list.get(i).getDeptId().intValue());
-                this.save(mceReceive1);
-                Integer mceReceiveId = mceReceive1.getId();
-                LambdaQueryWrapper<MceSetting> lambdaQuery = Wrappers.lambdaQuery();
-                lambdaQuery.eq(MceSetting::getCreateBy,list.get(i).getUserName());
-                List<MceSetting> list1 = mceSettingService.list(lambdaQuery);
-                if (CollectionUtils.isNotEmpty(list1)){
-                    JSONObject appMode = JSONObject.parseObject(list1.get(0).getAppMode());
-                    JSONObject wcMode = JSONObject.parseObject(list1.get(0).getWcMode());
-                    for (int j = 0; j < list3.size(); j++){
-                        if (appMode.get(mceReceiveVO.get("infoType").toString()).equals(true)){
-                            if (list.get(i).getUserId().equals(list3.get(j).getUserId()) && StringUtils.isNotBlank(list3.get(j).getCids())){
-                                mceContentService.sendApp(mceReceiveVO,list3.get(j).getCids(),0,0);
-                            }
-                        }
-                        if (wcMode.get(mceReceiveVO.get("infoType").toString()).equals(true)){
-                            if (list.get(i).getUserId().equals(list3.get(j).getUserId()) && StringUtils.isNotBlank(list3.get(j).getOpenid())){
-                                mceContentService.sendApp(mceReceiveVO,list3.get(j).getOpenid(),mceReceiveId,1);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/MceSettingServiceImpl.java

@@ -1,99 +0,0 @@
-package com.usky.iot.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.usky.common.core.bean.CommonPage;
-import com.usky.common.security.utils.SecurityUtils;
-import com.usky.iot.domain.MceContent;
-import com.usky.iot.domain.MceReceive;
-import com.usky.iot.domain.MceSetting;
-import com.usky.iot.mapper.MceSettingMapper;
-import com.usky.iot.service.MceSettingService;
-import com.usky.common.mybatis.core.AbstractCrudService;
-import org.springframework.stereotype.Service;
-
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 消息设置表 服务实现类
- * </p>
- *
- * @author han
- * @since 2024-04-19
- */
-@Service
-public class MceSettingServiceImpl extends AbstractCrudService<MceSettingMapper, MceSetting> implements MceSettingService {
-    @Override
-    public void add(MceSetting mceSetting){
-        if (mceSetting.getId().equals(0)){
-            mceSetting.setCreateBy(SecurityUtils.getUsername());
-            mceSetting.setCreateTime(LocalDateTime.now());
-            mceSetting.setTenantId(SecurityUtils.getTenantId());
-            long longValue = SecurityUtils.getLoginUser().getSysUser().getDeptId();
-            Integer intValue = (int) longValue;
-            mceSetting.setDeptId(intValue);
-            this.save(mceSetting);
-        }else {
-            mceSetting.setUpdateBy(SecurityUtils.getUsername());
-            mceSetting.setUpdateTime(LocalDateTime.now());
-            this.updateById(mceSetting);
-        }
-    }
-    @Override
-    public Map<String, Object> mceSettingInfo() {
-        LambdaQueryWrapper<MceSetting> lambdaQuery = Wrappers.lambdaQuery();
-        lambdaQuery.eq(MceSetting::getCreateBy, SecurityUtils.getUsername())
-                .eq(MceSetting::getTenantId,SecurityUtils.getTenantId());
-        List<MceSetting> list1 = this.list(lambdaQuery);
-        Map<String, Object> map = new HashMap<>();
-        if (CollectionUtils.isEmpty(list1)) {
-            Map<String, Object> map1 = new HashMap<>();
-            map1.put("1", true);
-            map1.put("2", true);
-            map1.put("3", true);
-            map1.put("4", true);
-            map.put("appMode",map1);
-            map.put("pcMode",map1);
-            map.put("wcMode",map1);
-            map.put("id",0);
-        }else {
-            map.put("appMode",JSONObject.parseObject(list1.get(0).getAppMode()));
-            map.put("pcMode",JSONObject.parseObject(list1.get(0).getPcMode()));
-            map.put("wcMode",JSONObject.parseObject(list1.get(0).getWcMode()));
-            map.put("id",list1.get(0).getId());
-        }
-        return map;
-    }
-
-    @Override
-    public CommonPage<Map<String, Object>> mceSettingList(String createBy,Integer current, Integer size) {
-        IPage<MceSetting> page = new Page<>(current, size);
-        List<Map<String, Object>> list = new ArrayList<>();
-        LambdaQueryWrapper<MceSetting> lambdaQuery = Wrappers.lambdaQuery();
-        lambdaQuery.eq(MceSetting::getTenantId,SecurityUtils.getTenantId())
-                .like(StringUtils.isNotBlank(createBy),MceSetting::getCreateBy,createBy);
-        page = this.page(page,lambdaQuery);
-        if (CollectionUtils.isNotEmpty(page.getRecords())) {
-            for (int i = 0; i < page.getRecords().size(); i++) {
-                Map<String, Object> map = new HashMap<>();
-                map.put("id",page.getRecords().get(i).getId());
-                map.put("createBy",page.getRecords().get(i).getCreateBy());
-                map.put("appMode",JSONObject.parseObject(page.getRecords().get(i).getAppMode()));
-                map.put("pcMode",JSONObject.parseObject(page.getRecords().get(i).getPcMode()));
-                map.put("wcMode",JSONObject.parseObject(page.getRecords().get(i).getWcMode()));
-                list.add(map);
-            }
-        }
-        return new CommonPage<>(list,page.getTotal(),page.getCurrent(),page.getSize());
-    }
-}

service-iot/service-iot-biz/src/main/resources/mapper/iot/MceContentMapper.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.iot.mapper.MceContentMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.iot.domain.MceContent">
-        <id column="id" property="id" />
-        <result column="info_title" property="infoTitle" />
-        <result column="info_content" property="infoContent" />
-        <result column="info_type" property="infoType" />
-        <result column="tenant_id" property="tenantId" />
-        <result column="dept_id" property="deptId" />
-        <result column="create_by" property="createBy" />
-        <result column="create_time" property="createTime" />
-        <result column="update_by" property="updateBy" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-</mapper>

service-iot/service-iot-biz/src/main/resources/mapper/iot/MceMbuserMapper.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.iot.mapper.MceMbuserMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.iot.domain.MceMbuser">
-        <id column="id" property="id" />
-        <result column="phone" property="phone" />
-        <result column="openid" property="openid" />
-        <result column="user_id" property="userId" />
-        <result column="cids" property="cids" />
-        <result column="create_by" property="createBy" />
-        <result column="create_time" property="createTime" />
-        <result column="update_by" property="updateBy" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-</mapper>

service-iot/service-iot-biz/src/main/resources/mapper/iot/MceReceiveMapper.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.iot.mapper.MceReceiveMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.iot.domain.MceReceive">
-        <id column="id" property="id" />
-        <result column="receiver_id" property="receiverId" />
-        <result column="receiver_name" property="receiverName" />
-        <result column="info_type" property="infoType" />
-        <result column="read_flag" property="readFlag" />
-        <result column="content_id" property="contentId" />
-        <result column="module_id" property="moduleId" />
-        <result column="tenant_id" property="tenantId" />
-        <result column="dept_id" property="deptId" />
-        <result column="create_by" property="createBy" />
-        <result column="create_time" property="createTime" />
-        <result column="update_by" property="updateBy" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-</mapper>

service-iot/service-iot-biz/src/main/resources/mapper/iot/MceSettingMapper.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.iot.mapper.MceSettingMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.iot.domain.MceSetting">
-        <id column="id" property="id" />
-        <result column="app_mode" property="appMode" />
-        <result column="pc_mode" property="pcMode" />
-        <result column="wc_mode" property="wcMode" />
-        <result column="tenant_id" property="tenantId" />
-        <result column="dept_id" property="deptId" />
-        <result column="create_by" property="createBy" />
-        <result column="create_time" property="createTime" />
-        <result column="update_by" property="updateBy" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-</mapper>