feat: 合并yunTeng的IOT代码

@@ -29,7 +29,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @RestController
 @RestController
 @RequestMapping("api/yt/admin")
 @RequestMapping("api/yt/admin")
 @RequiredArgsConstructor
 @RequiredArgsConstructor
-@PreAuthorize("hasAnyRole('SYS_ADMIN','PLATFORM_ADMIN')")
+//@PreAuthorize("hasAnyRole('SYS_ADMIN','PLATFORM_ADMIN')")
 public class YtAdminController extends BaseController {
 public class YtAdminController extends BaseController {
 
 
   private final YtTenantService ytTenantService;
   private final YtTenantService ytTenantService;

+package org.thingsboard.server.controller.yunteng;
+
+import io.jsonwebtoken.*;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.util.Assert;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.yunteng.dto.AlarmInfoDTO;
+import org.thingsboard.server.dao.yunteng.service.YtNoticeService;
+import org.thingsboard.server.service.security.exception.JwtExpiredTokenException;
+
+import java.net.InetAddress;
+
+/**
+ * @version V1.0
+ * @Description :
+ * 1.其它地方抛出异常，交由控制层统一处理
+ * 2.服务层注意持久化的事务管理
+ * @Dependency: 依赖包
+ * @Author: junlianglee
+ * @Date Created in 2021/11/23$
+ * @Copyright 2016-2018  - Powered By 云腾五洲
+ */
+@RestController
+@RequestMapping("/api/yt/notice")
+@RequiredArgsConstructor
+@Slf4j
+public class YtAlarmNoticeController {
+
+    private final YtNoticeService service;
+
+    @PostMapping("/alert")
+    public void alermNotice(@RequestParam(value = "token", required = true) String token,
+                            @RequestBody AlarmInfoDTO alarmInfo){
+        Assert.notNull(token, "token cannot be null");
+        Assert.notNull(alarmInfo, "alarm info cannot be null");
+        if(parseTokenClaims(token,alarmInfo)){
+            service.alert(token,alarmInfo);
+        }
+    }
+
+
+
+    private boolean parseTokenClaims(String token,AlarmInfoDTO alarmInfo) {
+        try {
+            Claims claims = Jwts.parser()
+                    .setSigningKey(alarmInfo.getSeverity())
+                    .parseClaimsJws(token)
+                    .getBody();
+            if(claims.get("deviceId").equals(alarmInfo.getDeviceId())
+                    &&claims.get("tenantId").equals(alarmInfo.getTenantId())
+                    &&claims.get("ip").equals(InetAddress.getLocalHost().getHostAddress())){
+                return true;
+            }
+            return false;
+        } catch (UnsupportedJwtException | MalformedJwtException | IllegalArgumentException | SignatureException ex) {
+            log.debug("Invalid JWT Token", ex);
+            throw new BadCredentialsException("Invalid JWT token: ", ex);
+        } catch (ExpiredJwtException expiredEx) {
+            log.debug("JWT Token is expired", expiredEx);
+            throw new JwtExpiredTokenException(expiredEx.getMessage());
+        } catch (Exception e) {
+            log.error("not allowed send notice",e);
+        }
+        return false;
+    }
+}

+package org.thingsboard.server.controller.yunteng;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.dto.SysAppDesignDTO;
+import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.service.SysAppDesignService;
+
+/**
+ * @author: 徐浩然
+ * @desc: APP定制
+ * @date: 2021/12/3-18:45
+ */
+@Api(tags = "APP定制")
+@RestController
+@RequestMapping("api/v1/appDesign")
+@RequiredArgsConstructor
+public class YtAppDesignController extends BaseController {
+
+  private final SysAppDesignService sysAppDesignService;
+
+  @GetMapping("get")
+  @ApiOperation("查询详情")
+  public ResponseEntity<SysAppDesignDTO> get() throws ThingsboardException {
+    return ResponseEntity.ok(sysAppDesignService.get(getCurrentUser().getCurrentTenantId()));
+  }
+
+  @PutMapping("update")
+  @ApiOperation("更新")
+  public ResponseEntity update(@RequestBody SysAppDesignDTO sysAppDesignDTO)
+      throws ThingsboardException {
+    sysAppDesignDTO.setId(null);
+    return sysAppDesignService.update(sysAppDesignDTO, getCurrentUser().getCurrentTenantId())
+        ? ResponseEntity.ok().build()
+        : ResponseEntity.badRequest().build();
+  }
+}

+package org.thingsboard.server.controller.yunteng;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.common.AddGroup;
+import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
+import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
+import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.dto.SysDictDTO;
+import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
+import org.thingsboard.server.common.data.yunteng.utils.tools.PageData;
+import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
+import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.service.SysDictService;
+
+import java.util.HashMap;
+
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
+
+@RestController
+@RequestMapping("api/v1/dict")
+@RequiredArgsConstructor
+public class YtDictController extends BaseController {
+  private final SysDictService sysDictService;
+
+  @GetMapping(params = {PAGE_SIZE, PAGE})
+  public PageData<SysDictDTO> pageSysDict(
+      @RequestParam(PAGE_SIZE) int pageSize,
+      @RequestParam(PAGE) int page,
+      @RequestParam(value = "dictName", required = false) String dictName,
+      @RequestParam(value = "dictCode", required = false) String dictCode,
+      @RequestParam(value = ORDER_FILED, required = false) String orderBy,
+      @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType) {
+
+    HashMap<String, Object> queryMap = new HashMap<>();
+    queryMap.put(PAGE_SIZE, pageSize);
+    queryMap.put(PAGE, page);
+    queryMap.put(ORDER_FILED, orderBy);
+    queryMap.put("dictName", dictName);
+    queryMap.put("dictCode", dictCode);
+    if (orderType != null) {
+      queryMap.put(ORDER_TYPE, orderType.name());
+    }
+    return sysDictService.page(queryMap);
+  }
+
+  @PostMapping
+  public ResponseResult<SysDictDTO> saveSysDict(
+      @Validated({AddGroup.class}) @RequestBody SysDictDTO sysDictDTO) throws ThingsboardException {
+    SysDictDTO newDTO =
+        sysDictService.saveSysDict(sysDictDTO, getCurrentUser().getCurrentTenantId());
+    return ResponseResult.success(newDTO);
+  }
+
+  @DeleteMapping
+  public ResponseResult<String> deleteSysDict(
+      @Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO) {
+    return sysDictService.deleteSysDict(deleteDTO.getIds())
+        ? ResponseResult.success(FastIotConstants.StateValue.DELETE_SUCCESS)
+        : ResponseResult.failed(FastIotConstants.StateValue.DELETE_FAILED);
+  }
+
+  @PutMapping
+  public ResponseResult<SysDictDTO> updateSysDict(
+      @Validated({UpdateGroup.class}) @RequestBody SysDictDTO SysDictDTO)
+      throws ThingsboardException {
+    return ResponseResult.success(
+        sysDictService.updateSysDict(SysDictDTO, getCurrentUser().getCurrentTenantId()));
+  }
+}

+package org.thingsboard.server.controller.yunteng;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.common.AddGroup;
+import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
+import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
+import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.dto.SysDictItemDTO;
+import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
+import org.thingsboard.server.common.data.yunteng.utils.tools.PageData;
+import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
+import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.service.SysDictItemService;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
+
+@RestController
+@RequestMapping("api/v1/dictItem")
+@RequiredArgsConstructor
+public class YtDictItemController extends BaseController {
+  private final SysDictItemService sysDictItemService;
+
+  @GetMapping(params = {PAGE_SIZE, PAGE})
+  public PageData<SysDictItemDTO> pageSysDictItem(
+      @RequestParam(PAGE_SIZE) int pageSize,
+      @RequestParam(PAGE) int page,
+      @RequestParam(value = "dictId", required = false) String dictId,
+      @RequestParam(value = "itemText", required = false) String itemText,
+      @RequestParam(value = "status", required = false) Integer status,
+      @RequestParam(value = ORDER_FILED, required = false) String orderBy,
+      @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType) {
+
+    HashMap<String, Object> queryMap = new HashMap<>();
+    queryMap.put(PAGE_SIZE, pageSize);
+    queryMap.put(PAGE, page);
+    queryMap.put(ORDER_FILED, orderBy);
+    queryMap.put("itemText", itemText);
+    queryMap.put("status", status);
+    queryMap.put("dictId", dictId);
+    if (orderType != null) {
+      queryMap.put(ORDER_TYPE, orderType.name());
+    }
+    return sysDictItemService.page(queryMap);
+  }
+
+  @PostMapping
+  public ResponseResult<SysDictItemDTO> saveSysDictItem(
+      @Validated({AddGroup.class}) @RequestBody SysDictItemDTO sysDictItemDTO)
+      throws ThingsboardException {
+    SysDictItemDTO newDTO =
+        sysDictItemService.saveSysDictItem(sysDictItemDTO, getCurrentUser().getCurrentTenantId());
+    return ResponseResult.success(newDTO);
+  }
+
+  @DeleteMapping
+  public ResponseResult<String> deleteSysDictItem(
+      @Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO) {
+    return sysDictItemService.deleteSysDictItem(deleteDTO.getIds())
+        ? ResponseResult.success(FastIotConstants.StateValue.DELETE_SUCCESS)
+        : ResponseResult.failed(FastIotConstants.StateValue.DELETE_FAILED);
+  }
+
+  @PutMapping
+  public ResponseResult<SysDictItemDTO> updateSysDictItem(
+      @Validated({UpdateGroup.class}) @RequestBody SysDictItemDTO SysDictItemDTO)
+      throws ThingsboardException {
+    return ResponseResult.success(
+        sysDictItemService.updateSysDictItem(
+            SysDictItemDTO, getCurrentUser().getCurrentTenantId()));
+  }
+
+  @PostMapping("/find")
+  public ResponseEntity<List<SysDictItemDTO>> findDictItemByDictCode(
+      @RequestBody Map<String, String> dictCode) {
+    return ResponseEntity.ok(sysDictItemService.findDictItemByDictCode(dictCode.get("dictCode")));
+  }
+}

+package org.thingsboard.server.controller.yunteng;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.dto.SysEnterpriseDTO;
+import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.service.SysEnterpriseService;
+
+/**
+ * @author: 徐浩然
+ * @desc: 企业信息
+ * @date: 2021/12/3-18:45
+ */
+@Api(tags = "企业信息")
+@RestController
+@RequestMapping("api/v1/enterprise")
+@RequiredArgsConstructor
+public class YtEnterpriseController extends BaseController {
+
+  private final SysEnterpriseService sysEnterpriseService;
+
+  @GetMapping("get")
+  @ApiOperation("查询详情")
+  public ResponseEntity<SysEnterpriseDTO> get() throws ThingsboardException {
+    return ResponseEntity.ok(sysEnterpriseService.get(getCurrentUser().getCurrentTenantId()));
+  }
+
+  @PutMapping("update")
+  @ApiOperation("更新")
+  public ResponseEntity update(@RequestBody SysEnterpriseDTO sysEnterpriseDTO)
+      throws ThingsboardException {
+    return sysEnterpriseService.update(sysEnterpriseDTO, getCurrentUser().getCurrentTenantId())
+        ? ResponseEntity.ok().build()
+        : ResponseEntity.badRequest().build();
+  }
+}

 package org.thingsboard.server.controller.yunteng;
 package org.thingsboard.server.controller.yunteng;
 
 
-import io.jsonwebtoken.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.util.Assert;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
-import org.thingsboard.server.common.data.yunteng.dto.AlarmInfoDTO;
-import org.thingsboard.server.dao.yunteng.service.YtNoticeService;
-import org.thingsboard.server.service.security.exception.JwtExpiredTokenException;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.dto.SysNoticeDTO;
+import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.SysNoticeTypeEnum;
+import org.thingsboard.server.common.data.yunteng.utils.tools.PageData;
+import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.entities.SysNotice;
+import org.thingsboard.server.dao.yunteng.service.SysNoticeService;
 
 
-import java.net.InetAddress;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 
 /**
 /**
- * @version V1.0
- * @Description :
- * 1.其它地方抛出异常，交由控制层统一处理
- * 2.服务层注意持久化的事务管理
- * @Dependency: 依赖包
- * @Author: junlianglee
- * @Date Created in 2021/11/23$
- * @Copyright 2016-2018  - Powered By 云腾五洲
+ * @author: 徐浩然
+ * @desc: 通知管理
+ * @date: 2021/12/2-11:05
  */
  */
+@Api(tags = "通知管理")
 @RestController
 @RestController
-@RequestMapping("/api/yt/notice")
+@RequestMapping("api/v1/notice")
 @RequiredArgsConstructor
 @RequiredArgsConstructor
-@Slf4j
-public class YtNoticeController {
+public class YtNoticeController extends BaseController {
 
 
-    private final YtNoticeService service;
+  private final SysNoticeService sysNoticeService;
 
 
-    @PostMapping("/alert")
-    public void alermNotice(@RequestParam(value = "token", required = true) String token,
-                            @RequestBody AlarmInfoDTO alarmInfo){
-        Assert.notNull(token, "token cannot be null");
-        Assert.notNull(alarmInfo, "alarm info cannot be null");
-        if(parseTokenClaims(token,alarmInfo)){
-            service.alert(token,alarmInfo);
-        }
+  @GetMapping(
+      path = "page",
+      params = {PAGE_SIZE, PAGE})
+  @ApiOperation("分页")
+  public PageData<SysNoticeDTO> page(
+      @RequestParam(value = "type", required = false) SysNoticeTypeEnum type,
+      @RequestParam(PAGE_SIZE) int pageSize,
+      @RequestParam(PAGE) int page,
+      @RequestParam(value = ORDER_FILED, required = false) String orderBy,
+      @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
+      throws ThingsboardException {
+    Map<String, Object> queryMap = new HashMap<>();
+    queryMap.put(PAGE_SIZE, pageSize);
+    queryMap.put(PAGE, page);
+    queryMap.put(ORDER_FILED, orderBy);
+    queryMap.put("tenantCode", getCurrentUser().getCurrentTenantId());
+    if (orderType != null) {
+      queryMap.put(ORDER_TYPE, orderType.name());
+    }
+    // 通知类型
+    if (type != null) {
+      queryMap.put("type", type.name());
     }
     }
+    return sysNoticeService.page(queryMap);
+  }
 
 
+  @GetMapping("{id}")
+  @ApiOperation("详情")
+  public ResponseEntity<SysNoticeDTO> get(@PathVariable("id") String id)
+      throws ThingsboardException {
+    return ResponseEntity.ok(sysNoticeService.get(id, getCurrentUser().getCurrentTenantId()));
+  }
 
 
+  @DeleteMapping("delete")
+  @ApiOperation("批量删除")
+  public ResponseEntity delete(@RequestParam List<String> ids) throws ThingsboardException {
+    boolean flag = sysNoticeService.delete(ids, getCurrentUser().getCurrentTenantId());
+    return flag ? ResponseEntity.ok().build() : ResponseEntity.badRequest().build();
+  }
 
 
-    private boolean parseTokenClaims(String token,AlarmInfoDTO alarmInfo) {
-        try {
-            Claims claims = Jwts.parser()
-                    .setSigningKey(alarmInfo.getSeverity())
-                    .parseClaimsJws(token)
-                    .getBody();
-            if(claims.get("deviceId").equals(alarmInfo.getDeviceId())
-                    &&claims.get("tenantId").equals(alarmInfo.getTenantId())
-                    &&claims.get("ip").equals(InetAddress.getLocalHost().getHostAddress())){
-                return true;
-            }
-            return false;
-        } catch (UnsupportedJwtException | MalformedJwtException | IllegalArgumentException | SignatureException ex) {
-            log.debug("Invalid JWT Token", ex);
-            throw new BadCredentialsException("Invalid JWT token: ", ex);
-        } catch (ExpiredJwtException expiredEx) {
-            log.debug("JWT Token is expired", expiredEx);
-            throw new JwtExpiredTokenException(expiredEx.getMessage());
-        } catch (Exception e) {
-            log.error("not allowed send notice",e);
-        }
-        return false;
-    }
+  @PostMapping("save")
+  @ApiOperation("保存草稿")
+  public ResponseEntity save(@RequestBody SysNoticeDTO sysNoticeDTO) throws ThingsboardException {
+    SysNotice sysNotice =
+        sysNoticeService.save(sysNoticeDTO, getCurrentUser().getCurrentTenantId());
+    return sysNotice == null ? ResponseEntity.badRequest().build() : ResponseEntity.ok().build();
+  }
+
+  @PostMapping("send")
+  @ApiOperation("发布通知")
+  public ResponseEntity send(@RequestBody SysNoticeDTO sysNoticeDTO) throws ThingsboardException {
+    SysNotice sysNotice =
+        sysNoticeService.send(
+            sysNoticeDTO,
+            getCurrentUser().getCurrentTenantId(),
+            getCurrentUser().getCurrentUserId(),
+            "");
+    return sysNotice == null ? ResponseEntity.badRequest().build() : ResponseEntity.ok().build();
+  }
 }
 }

+package org.thingsboard.server.controller.yunteng;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.dto.SysNoticeUserDTO;
+import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.SysNoticeTypeEnum;
+import org.thingsboard.server.common.data.yunteng.utils.tools.PageData;
+import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.service.SysNoticeUserService;
+
+import java.util.HashMap;
+import java.util.Map;
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
+
+/**
+ * @author: 徐浩然
+ * @desc: 我的通知
+ * @date: 2021/12/2-22:19
+ */
+@Api(tags = "我的通知")
+@RestController
+@RequestMapping("api/v1/noticeUser")
+@RequiredArgsConstructor
+public class YtNoticeUserController extends BaseController {
+
+  private final SysNoticeUserService sysNoticeUserService;
+
+  @GetMapping(
+      path = "read",
+      params = {PAGE_SIZE, PAGE})
+  @ApiOperation("查看人员阅读情况分页")
+  public PageData<SysNoticeUserDTO> read(
+      @RequestParam(PAGE_SIZE) int pageSize,
+      @RequestParam(PAGE) int page,
+      @RequestParam(value = ORDER_FILED, required = false) String orderBy,
+      @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType) throws ThingsboardException {
+    Map<String, Object> queryMap = getMap(pageSize, page, orderBy, orderType);
+    return sysNoticeUserService.read(queryMap, getCurrentUser().getCurrentUserId());
+  }
+
+  @GetMapping(
+      path = "page",
+      params = {PAGE_SIZE, PAGE})
+  @ApiOperation("我的通知分页")
+  public PageData<SysNoticeUserDTO> page(
+          @RequestParam(value = "type", required = false) SysNoticeTypeEnum type,
+      @RequestParam(PAGE_SIZE) int pageSize,
+      @RequestParam(PAGE) int page,
+      @RequestParam(value = ORDER_FILED, required = false) String orderBy,
+      @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType) throws ThingsboardException {
+    Map<String, Object> queryMap = getMap(pageSize, page, orderBy, orderType);
+    // 通知类型
+    if (type != null) {
+      queryMap.put("type", type.name());
+    }
+    return sysNoticeUserService.page(queryMap);
+  }
+
+  @GetMapping("{id}")
+  @ApiOperation("详情")
+  public ResponseEntity<SysNoticeUserDTO> get(@PathVariable("id") String id) throws ThingsboardException {
+    return ResponseEntity.ok(sysNoticeUserService.get(id, getCurrentUser().getCurrentTenantId()));
+  }
+
+  @NotNull
+  private Map<String, Object> getMap(
+      @RequestParam(PAGE_SIZE) int pageSize,
+      @RequestParam(PAGE) int page,
+      @RequestParam(value = ORDER_FILED, required = false) String orderBy,
+      @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType) throws ThingsboardException {
+    Map<String, Object> queryMap = new HashMap<>();
+    queryMap.put(PAGE_SIZE, pageSize);
+    queryMap.put(PAGE, page);
+    queryMap.put(ORDER_FILED, orderBy);
+    queryMap.put("tenantCode", getCurrentUser().getCurrentUserId());
+    if (orderType != null) {
+      queryMap.put(ORDER_TYPE, orderType.name());
+    }
+    return queryMap;
+  }
+}

+package org.thingsboard.server.controller.yunteng;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
+import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
+import org.thingsboard.server.common.data.yunteng.core.exception.FastIotException;
+import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO;
+import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.service.OrganizationService;
+
+import java.net.URI;
+import java.util.List;
+import java.util.Optional;
+
+@RestController
+@RequestMapping("api/v1/organization")
+@RequiredArgsConstructor
+public class YtOrganizationController extends BaseController {
+
+  private final OrganizationService organizationService;
+
+  @PostMapping
+  public ResponseEntity<OrganizationDTO> saveGroup(@RequestBody OrganizationDTO groupDTO)
+          throws FastIotException, ThingsboardException {
+    OrganizationDTO newGroupDTO =
+        organizationService.saveOrganization(groupDTO, getCurrentUser().getCurrentTenantId());
+    return Optional.ofNullable(newGroupDTO)
+        .map(
+            dto -> {
+              URI location =
+                  ServletUriComponentsBuilder.fromCurrentRequest()
+                      .path("/{id}")
+                      .buildAndExpand(newGroupDTO.getId())
+                      .toUri();
+              return ResponseEntity.created(location).body(newGroupDTO);
+            })
+        .orElse(ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build());
+  }
+
+  @DeleteMapping
+  public ResponseEntity<Boolean> deleteOrganizations(
+          @Validated(DeleteGroup.class) @RequestBody DeleteDTO deleteDTO) throws ThingsboardException {
+    return ResponseEntity.ok(
+        organizationService.deleteOrganizations(deleteDTO, getCurrentUser().getCurrentTenantId()));
+  }
+
+  @GetMapping("/me/organizations")
+  public List<OrganizationDTO> getMyOrganizations() {
+    return organizationService.getMyOrganizations();
+  }
+
+  @PutMapping
+  public OrganizationDTO updateOrganization(@Validated(UpdateGroup.class) @RequestBody OrganizationDTO groupDTO) {
+    return organizationService.updateOrganization(groupDTO);
+  }
+
+  @PutMapping("saveOrUpdateUserOrganizationMapping/{userId}")
+  public void bindUserToOrganization(
+      @RequestBody String[] organizationIds, @PathVariable("userId") String userId) {
+    organizationService.bindUserToOrganization(userId, organizationIds);
+  }
+}

+package org.thingsboard.server.controller.yunteng;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.thingsboard.server.common.data.yunteng.core.utils.FileStorageService;
+import org.thingsboard.server.common.data.yunteng.dto.FileUploadResponse;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@RestController
+@RequestMapping("api/v1/oss")
+public class YtOssFileController {
+
+  private final FileStorageService fileStorageService;
+
+  public YtOssFileController(FileStorageService fileStorageService) {
+    this.fileStorageService = fileStorageService;
+  }
+
+  @PostMapping("upload")
+  public FileUploadResponse uploadFile(@RequestParam("file") MultipartFile file) {
+    return fileStorageService.upload(file);
+  }
+
+  @GetMapping("/downloadFile/{fileName:.+}")
+  public ResponseEntity<?> downloadFile(
+      @PathVariable String fileName, HttpServletRequest request, HttpServletResponse response) {
+    return fileStorageService.download(fileName, request, response);
+  }
+}

+package org.thingsboard.server.controller.yunteng;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.dto.SysPlatformDesignDTO;
+import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.service.SysPlatformDesignService;
+
+/**
+ * @author: 徐浩然
+ * @desc: 平台定制
+ * @date: 2021/12/3-18:44
+ */
+@Api(tags = "平台定制")
+@RestController
+@RequestMapping("api/v1/platform")
+@RequiredArgsConstructor
+public class YtPlatformDesignController extends BaseController {
+
+  private final SysPlatformDesignService sysPlatformDesignService;
+
+  @GetMapping("get")
+  @ApiOperation("查询详情")
+  public ResponseEntity<SysPlatformDesignDTO> get() throws ThingsboardException {
+    return ResponseEntity.ok(sysPlatformDesignService.get(getCurrentUser().getCurrentTenantId()));
+  }
+
+  @PutMapping("update")
+  @ApiOperation("更新")
+  public ResponseEntity update(@RequestBody SysPlatformDesignDTO sysPlatformDesignDTO)
+      throws ThingsboardException {
+    return sysPlatformDesignService.update(
+            sysPlatformDesignDTO, getCurrentUser().getCurrentTenantId())
+        ? ResponseEntity.ok().build()
+        : ResponseEntity.badRequest().build();
+  }
+}

@@ -23,7 +23,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @RestController
 @RestController
 @RequestMapping("api/yt/role")
 @RequestMapping("api/yt/role")
 @RequiredArgsConstructor
 @RequiredArgsConstructor
-public class RoleController extends BaseController {
+public class YtRoleController extends BaseController {
 
 
   private final RoleService roleService;
   private final RoleService roleService;
 
 

+package org.thingsboard.server.controller.yunteng;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
+import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.dto.SmsLogDTO;
+import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
+import org.thingsboard.server.common.data.yunteng.utils.tools.PageData;
+import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
+import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.service.SmsLogService;
+
+import java.util.HashMap;
+
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
+
+@RestController
+@RequestMapping("api/v1/smsLog")
+@RequiredArgsConstructor
+public class YtSmsLogController extends BaseController {
+
+  private final SmsLogService smsLogService;
+
+  @GetMapping(params = {PAGE_SIZE, PAGE})
+  public PageData<SmsLogDTO> pageMessageConfig(
+      @RequestParam(PAGE_SIZE) int pageSize,
+      @RequestParam(PAGE) int page,
+      @RequestParam(value = "toPhone", required = false) String toPhone,
+      @RequestParam(value = "startTime", required = false) String startTime,
+      @RequestParam(value = "endTime", required = false) String endTime,
+      @RequestParam(value = ORDER_FILED, required = false) String orderBy,
+      @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
+      throws ThingsboardException {
+
+    HashMap<String, Object> queryMap = new HashMap<>();
+    queryMap.put(PAGE_SIZE, pageSize);
+    queryMap.put(PAGE, page);
+    queryMap.put(ORDER_FILED, orderBy);
+    queryMap.put("toPhone", toPhone);
+    queryMap.put("startTime", startTime);
+    queryMap.put("endTime", endTime);
+    if (orderType != null) {
+      queryMap.put(ORDER_TYPE, orderType.name());
+    }
+    return smsLogService.page(queryMap, getCurrentUser().getCurrentTenantId());
+  }
+
+  @DeleteMapping
+  public ResponseResult<String> deleteMailLog(
+      @Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO) {
+    return smsLogService.deleteSmsLog(deleteDTO.getIds())
+        ? ResponseResult.success(FastIotConstants.StateValue.DELETE_SUCCESS)
+        : ResponseResult.failed(FastIotConstants.StateValue.DELETE_FAILED);
+  }
+}

+package org.thingsboard.server.controller.yunteng;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.dto.request.SendResetPasswordEmailMsg;
+import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.service.YtUserService;
+
+@RestController
+@RequestMapping("/api/v1/tenant")
+@RequiredArgsConstructor
+public class YtTenantController extends BaseController {
+
+  private final YtUserService userService;
+
+  @PostMapping("/resetPassword/{userId}")
+  public void resetPassword(@PathVariable("userId") String userId) throws ThingsboardException {
+    userService.resetPassword(
+        userId, getCurrentUser().isPtSysadmin(), getCurrentUser().getCurrentTenantId());
+  }
+
+  @PostMapping("/sendRestPasswordMsg")
+  public void resetPassword(@RequestBody SendResetPasswordEmailMsg msg) {
+    userService.sendRestPasswordMsg(msg);
+  }
+}

+package org.thingsboard.server.controller.yunteng;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.thingsboard.server.dao.yunteng.entities.SysTown;
+import org.thingsboard.server.dao.yunteng.service.SysTownService;
+
+import java.util.List;
+
+/**
+ * @author: 徐浩然
+ * @desc: 中国城镇区街
+ * @date: 2021/12/3-15:56
+ */
+@Api(tags = "中国城镇区街")
+@RestController
+@RequestMapping("api/v1/town")
+@RequiredArgsConstructor
+public class YtTownController {
+  private final SysTownService sysTownService;
+
+  @GetMapping("list")
+  @ApiOperation("查询所有省份")
+  public ResponseEntity<List<SysTown>> getCityList() {
+    return ResponseEntity.ok(sysTownService.getCityList());
+  }
+
+  @GetMapping("childs/{variable}/{value}")
+  @ApiOperation("查询子集")
+  public ResponseEntity<List<SysTown>> childs(
+      @PathVariable("variable") String variable, @PathVariable("value") String value) {
+    return ResponseEntity.ok(sysTownService.findChilds(variable, value));
+  }
+}

@@ -60,4 +60,20 @@ public interface FastIotConstants {
     String TB_CACHE_CONFIG_KEY = "TB_CONNECT_CACHE";
     String TB_CACHE_CONFIG_KEY = "TB_CONNECT_CACHE";
     String EXISTING_TENANT = "EXISTING_TENANT";
     String EXISTING_TENANT = "EXISTING_TENANT";
   }
   }
+  interface ReadState {
+    String UNREAD = "0";
+    String READ = "1";
+  }
+
+  interface ReceiverType {
+    String PERSONAL = "3";
+    String DEPARTMENT = "2";
+    String ORGANIZATION = "1";
+    String ALL = "0";
+  }
+
+  interface DraftStatus {
+    String PUBLISHED = "1";
+    String DRAFT = "0";
+  }
 }
 }

@@ -12,6 +12,10 @@ public final class ModelConstants {
     public static final String TENANT_ROLE_TABLE_NAME = "sys_tenant_role";
     public static final String TENANT_ROLE_TABLE_NAME = "sys_tenant_role";
     /** 菜单表 */
     /** 菜单表 */
     public static final String MENU_TABLE_NAME = "sys_menu";
     public static final String MENU_TABLE_NAME = "sys_menu";
+    /** 通知管理 */
+    public static final String SYS_NOTICE_TABLE_NAME = "sys_notice";
+    /** 我的通知 */
+    public static final String SYS_NOTICE_USER_TABLE_NAME = "sys_notice_user";
     /** 角色表 */
     /** 角色表 */
     public static final String ROLE_TABLE_NAME = "sys_role";
     public static final String ROLE_TABLE_NAME = "sys_role";
     /** 用户角色关系表 */
     /** 用户角色关系表 */
@@ -48,6 +52,14 @@ public final class ModelConstants {
     public static final String IOTFS_ALARM_PROFILE_TABLE_NAME = "iotfs_alarm_profile";
     public static final String IOTFS_ALARM_PROFILE_TABLE_NAME = "iotfs_alarm_profile";
     /** 告警联系人 */
     /** 告警联系人 */
     public static final String IOTFS_ALARM_CONTACT_TABLE_NAME = "iotfs_alarm_contact";
     public static final String IOTFS_ALARM_CONTACT_TABLE_NAME = "iotfs_alarm_contact";
+    /** 企业信息 */
+    public static final String SYS_ENTERPRISE_TABLE_NAME = "sys_enterprise";
+    /** 平台定制 */
+    public static final String SYS_PLATFORM_DESIGN_TABLE_NAME = "sys_platform_design";
+    /** APP定制 */
+    public static final String SYS_APP_DESIGN_TABLE_NAME = "sys_app_design";
+    /** 中国城镇区街 */
+    public static final String SYS_TOWN_TABLE_NAME = "sys_town";
   }
   }
 
 
   public static class TableFields {
   public static class TableFields {

@@ -28,6 +28,7 @@ public enum ErrorMessage {
   NONE_DEFAULT_RULE_CHAIN(400009,"该租户不存在默认的规则链"),
   NONE_DEFAULT_RULE_CHAIN(400009,"该租户不存在默认的规则链"),
   TENANT_MISMATCHING(400010,"租户不匹配"),
   TENANT_MISMATCHING(400010,"租户不匹配"),
   GET_CURRENT_USER_EXCEPTION(400011,"获取当前用户信息异常"),
   GET_CURRENT_USER_EXCEPTION(400011,"获取当前用户信息异常"),
+  SEND_DESTINATION_NOT_FOUND(400012,"通知失败！找不到发送目标"),
   CONNECT_TO_TB_ERROR(500001,"与TB联系错误"),
   CONNECT_TO_TB_ERROR(500001,"与TB联系错误"),
   HAVE_NO_PERMISSION(500002,"没有修改权限");
   HAVE_NO_PERMISSION(500002,"没有修改权限");
   private final int code;
   private final int code;

+package org.thingsboard.server.common.data.yunteng.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.JsonNode;
+import lombok.Data;
+import org.thingsboard.server.common.data.yunteng.common.aspect.annotation.AutoDict;
+
+import java.time.LocalDateTime;
+
+@Data
+public class SmsLogDTO extends BaseDTO {
+
+  /** 短信平台类型 */
+  @AutoDict(dictCode = "platform_type")
+  private String type;
+
+  /** 发送状态：ResponseCodeEnum枚举值 */
+  private String status;
+
+  /** 发送时间 */
+  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  private LocalDateTime sendTime;
+
+  /** 发送手机号 */
+  private String toPhone;
+
+  /** 发送模板参数 */
+  private JsonNode templateParam;
+
+  /** 租户Code */
+  private String tenantCode;
+
+  /**用途*/
+  @AutoDict(dictCode = "template_purpose")
+  private String templatePurpose;
+
+  /**备注*/
+  private String remark;
+}

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * @author: 徐浩然
+ * @desc: APP定制
+ * @date: 2021/12/3-18:23
+ */
+@Data
+@ApiModel(value = "APP定制")
+@RequiredArgsConstructor
+public class SysAppDesignDTO extends BaseDTO {
+  @ApiModelProperty(value = "平台名称")
+  private String name;
+  @ApiModelProperty(value = "logo地址")
+  private String logo;
+  @ApiModelProperty(value = "背景图片地址")
+  private String background;
+  @ApiModelProperty(value = "背景颜色")
+  private String backgroundColor;
+  @ApiModelProperty(value = "轮播图,地址\",\"分割")
+  private String rotation;
+}

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * @author: 徐浩然
+ * @desc: 企业信息
+ * @date: 2021/12/3-18:11
+ */
+@Data
+@ApiModel(value = "企业信息")
+@RequiredArgsConstructor
+public class SysEnterpriseDTO extends BaseDTO {
+  @ApiModelProperty(value = "公司名称")
+  private String name;
+  @ApiModelProperty(value = "公司简称")
+  private String abbreviation;
+  @ApiModelProperty(value = "公司官网")
+  private String officialWebsite;
+  @ApiModelProperty(value = "公司邮箱")
+  private String email;
+  @ApiModelProperty(value = "公司简介")
+  private String synopsis;
+  @ApiModelProperty(value = "详细地址")
+  private String address;
+  @ApiModelProperty(value = "联系人")
+  private String contacts;
+  @ApiModelProperty(value = "区号")
+  private String area;
+  @ApiModelProperty(value = "联系电话")
+  private String tel;
+  @ApiModelProperty(value = "省")
+  private String nameProv;
+  @ApiModelProperty(value = "省code")
+  private String codeProv;
+  @ApiModelProperty(value = "市")
+  private String nameCity;
+  @ApiModelProperty(value = "市code")
+  private String codeCity;
+  @ApiModelProperty(value = "区")
+  private String nameCoun;
+  @ApiModelProperty(value = "区code")
+  private String codeCoun;
+  @ApiModelProperty(value = "县")
+  private String nameTown;
+  @ApiModelProperty(value = "县code")
+  private String codeTown;
+}

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.enums.SysNoticeTypeEnum;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @author: 徐浩然
+ * @desc: 通知管理
+ * @date: 2021/12/2-10:32
+ */
+@Data
+@ApiModel(value = "通知管理")
+@EqualsAndHashCode(callSuper = false)
+public class SysNoticeDTO extends TenantDTO {
+
+  private static final long serialVersionUID = 3466370312762440488L;
+  @ApiModelProperty(value = "通知类型",required = true)
+  private SysNoticeTypeEnum type;
+  @ApiModelProperty(value = "标题",required = true)
+  private String title;
+  @ApiModelProperty(value = "内容",required = true)
+  private String content;
+  @ApiModelProperty(value = "接收者（字典值receiver_type）  0：全部  1：组织  2：部门  3：个人",required = true)
+  private String receiverType;
+  @ApiModelProperty(value = "根据receiverType不同变化，，0:传空，1:组织id，2:部门id，3:用户id",required = true)
+  private List<String> pointId;
+  @ApiModelProperty(value = "接收者ID，用逗号分开")
+  private String receiverTypeIds;
+  @ApiModelProperty(value = "发送状态（字典值draft_status）  0：草稿  1：已发布")
+  private String status;
+  @ApiModelProperty(value = "发送者")
+  private String senderName;
+  @ApiModelProperty(value = "发送时间")
+  private LocalDateTime senderDate;
+}

+package org.thingsboard.server.common.data.yunteng.dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.enums.SysNoticeTypeEnum;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author: 徐浩然
+ * @desc: 我的通知
+ * @date: 2021/12/2-10:56
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SysNoticeUserDTO extends TenantDTO {
+
+  private static final long serialVersionUID = -5421685500963791707L;
+  @ApiModelProperty(value = "接收者ID")
+  private String receiverId;
+  @ApiModelProperty(value = "通知ID")
+  private String NoticeId;
+  @ApiModelProperty(value = "阅读状态 0：未读 1：已读")
+  private String ReadStatus;
+  @ApiModelProperty(value = "阅读时间")
+  private LocalDateTime ReadDate;
+  @ApiModelProperty(value = "通知类型")
+  private SysNoticeTypeEnum type;
+  @ApiModelProperty(value = "发送者")
+  private String senderName;
+  @ApiModelProperty(value = "通知管理")
+  private SysNoticeDTO sysNotice;
+}

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * @author: 徐浩然
+ * @desc: 平台定制
+ * @date: 2021/12/3-18:20
+ */
+@Data
+@ApiModel(value = "平台定制")
+@RequiredArgsConstructor
+public class SysPlatformDesignDTO extends BaseDTO {
+  @ApiModelProperty(value = "平台名称")
+  private String name;
+  @ApiModelProperty(value = "logo地址")
+  private String logo;
+  @ApiModelProperty(value = "icon图标地址")
+  private String icon;
+  @ApiModelProperty(value = "背景图片地址")
+  private String background;
+  @ApiModelProperty(value = "背景颜色")
+  private String backgroundColor;
+  @ApiModelProperty(value = "版权信息")
+  private String copyright;
+  @ApiModelProperty(value = "备案信息")
+  private String presentedOurselves;
+  @ApiModelProperty(value = "域名")
+  private String domain;
+}

+package org.thingsboard.server.common.data.yunteng.enums;
+
+/**
+ * @author: 徐浩然
+ * @desc: 通知类型
+ * @date: 2021/12/2-11:20
+ */
+public enum SysNoticeTypeEnum {
+  /** 公告 */
+  NOTICE,
+  /** 会议 */
+  MEETING,
+  /** 其它 */
+  OTHER
+}

+package org.thingsboard.server.dao.yunteng.entities;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
+
+/**
+ * @author: 徐浩然
+ * @desc: APP定制
+ * @date: 2021/12/3-18:23
+ */
+@Data
+@RequiredArgsConstructor
+@TableName(ModelConstants.Table.SYS_APP_DESIGN_TABLE_NAME)
+public class SysAppDesign extends TenantBaseEntity {
+  private static final long serialVersionUID = -3412813210017919075L;
+  /** 平台名称 */
+  private String name;
+  /** logo地址 */
+  private String logo;
+  /** 背景图片地址 */
+  private String background;
+  /** 背景颜色 */
+  private String backgroundColor;
+  /** 轮播图,地址","分割 */
+  private String rotation;
+}

+package org.thingsboard.server.dao.yunteng.entities;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
+
+/**
+ * @author: 徐浩然
+ * @desc: 企业信息
+ * @date: 2021/12/3-18:11
+ */
+@Data
+@RequiredArgsConstructor
+@TableName(ModelConstants.Table.SYS_ENTERPRISE_TABLE_NAME)
+public class SysEnterprise extends TenantBaseEntity {
+  private static final long serialVersionUID = -804373668052255756L;
+  /** 公司名称 */
+  private String name;
+  /** 公司简称 */
+  private String abbreviation;
+  /** 公司官网 */
+  private String officialWebsite;
+  /** 公司邮箱 */
+  private String email;
+  /** 公司简介 */
+  private String synopsis;
+  /** 详细地址 */
+  private String address;
+  /** 联系人 */
+  private String contacts;
+  /** 区号 */
+  private String area;
+  /** 联系电话 */
+  private String tel;
+  /** 县code */
+  private String codeTown;
+  /** 省 */
+  @TableField(exist = false)
+  private String nameProv;
+  /** 省code */
+  @TableField(exist = false)
+  private String codeProv;
+  /** 市 */
+  @TableField(exist = false)
+  private String nameCity;
+  /** 市code */
+  @TableField(exist = false)
+  private String codeCity;
+  /** 区 */
+  @TableField(exist = false)
+  private String nameCoun;
+  /** 区code */
+  @TableField(exist = false)
+  private String codeCoun;
+  /** 县 */
+  @TableField(exist = false)
+  private String nameTown;
+}

+package org.thingsboard.server.dao.yunteng.entities;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
+import org.thingsboard.server.common.data.yunteng.enums.SysNoticeTypeEnum;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author: 徐浩然
+ * @desc: 通知管理
+ * @date: 2021/12/2-10:32
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName(ModelConstants.Table.SYS_NOTICE_TABLE_NAME)
+public class SysNotice extends TenantBaseEntity {
+
+  private static final long serialVersionUID = 3466370312762440488L;
+  /** 通知类型 */
+  private SysNoticeTypeEnum type;
+  /** 标题 */
+  private String title;
+  /** 内容 */
+  private String content;
+  /** 接收者（字典值receiver_type）  0：全部  1：组织  2：部门  3：个人 */
+  private String receiverType;
+  /** 接收者ID，用逗号分开 */
+  private String receiverTypeIds;
+  /** 发送状态（字典值draft_status）  0：草稿  1：已发布 */
+  private String status;
+  /** 发送者 */
+  private String senderName;
+  /** 发送时间 */
+  private LocalDateTime senderDate;
+}

+package org.thingsboard.server.dao.yunteng.entities;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
+import org.thingsboard.server.common.data.yunteng.enums.SysNoticeTypeEnum;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author: 徐浩然
+ * @desc: 我的通知
+ * @date: 2021/12/2-10:56
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName(ModelConstants.Table.SYS_NOTICE_USER_TABLE_NAME)
+public class SysNoticeUser extends TenantBaseEntity {
+
+  private static final long serialVersionUID = -5421685500963791707L;
+  /** 接收者ID */
+  private String receiverId;
+  /** 通知ID */
+  private String NoticeId;
+  /** 阅读状态 0：未读 1：已读 */
+  private String ReadStatus;
+  /** 阅读时间 */
+  private LocalDateTime ReadDate;
+  /** 通知类型 */
+  @TableField(exist = false)
+  private SysNoticeTypeEnum type;
+  /** 发送者 */
+  @TableField(exist = false)
+  private String senderName;
+  /** 发送时间 */
+  @TableField(exist = false)
+  private LocalDateTime senderDate;
+}

+package org.thingsboard.server.dao.yunteng.entities;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
+
+/**
+ * @author: 徐浩然
+ * @desc: 平台定制
+ * @date: 2021/12/3-18:20
+ */
+@Data
+@RequiredArgsConstructor
+@TableName(ModelConstants.Table.SYS_PLATFORM_DESIGN_TABLE_NAME)
+public class SysPlatformDesign extends TenantBaseEntity {
+  private static final long serialVersionUID = 6761478750642927740L;
+  /** 平台名称 */
+  private String name;
+  /** logo地址 */
+  private String logo;
+  /** icon图标地址 */
+  private String icon;
+  /** 背景图片地址 */
+  private String background;
+  /** 背景颜色 */
+  private String backgroundColor;
+  /** 版权信息 */
+  private String copyright;
+  /** 备案信息 */
+  private String presentedOurselves;
+  /** 域名 */
+  private String domain;
+}

+package org.thingsboard.server.dao.yunteng.entities;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
+
+/**
+ * @author: 徐浩然
+ * @desc: 中国城镇区街
+ * @date: 2021/12/3-15:31
+ */
+@Data
+@ApiModel(value = "中国城镇区街")
+@TableName(ModelConstants.Table.SYS_TOWN_TABLE_NAME)
+public class SysTown {
+  @ApiModelProperty(value = "省")
+  private String nameProv;
+  @ApiModelProperty(value = "省code")
+  private String codeProv;
+  @ApiModelProperty(value = "市")
+  private String nameCity;
+  @ApiModelProperty(value = "市code")
+  private String codeCity;
+  @ApiModelProperty(value = "区")
+  private String nameCoun;
+  @ApiModelProperty(value = "区code")
+  private String codeCoun;
+  @ApiModelProperty(value = "县")
+  private String nameTown;
+  @ApiModelProperty(value = "县code")
+  private String codeTown;
+}

+package org.thingsboard.server.dao.yunteng.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.thingsboard.server.common.data.yunteng.dto.SmsLogDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.PageData;
+import org.thingsboard.server.dao.yunteng.entities.SmsLog;
+import org.thingsboard.server.dao.yunteng.mapper.SmsLogMapper;
+import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.SmsLogService;
+
+import java.util.Map;
+import java.util.Set;
+
+@Service
+@Slf4j
+@RequiredArgsConstructor
+public class SmsLogServiceImpl extends AbstractBaseService<SmsLogMapper, SmsLog>
+    implements SmsLogService {
+
+  @Override
+  public PageData<SmsLogDTO> page(Map<String, Object> queryMap,String tenantId) {
+    IPage<SmsLog> configIPage =
+        baseMapper.selectPage(
+            getPage(queryMap, "send_time", false),
+            new QueryWrapper<SmsLog>()
+                .lambda()
+                .eq(SmsLog::getTenantCode,tenantId)
+                .like(
+                    queryMap.get("toPhone") != null,
+                    SmsLog::getToPhone,
+                    String.valueOf(queryMap.get("toPhone")))
+                .between(
+                    queryMap.get("startTime") != null && queryMap.get("endTime") != null,
+                    SmsLog::getSendTime,
+                    queryMap.get("startTime"),
+                    queryMap.get("endTime")));
+    return getPageData(configIPage, SmsLogDTO.class);
+  }
+
+  @Override
+  @Transactional
+  public boolean deleteSmsLog(Set<String> ids) {
+    return baseMapper.deleteBatchIds(ids) > 0;
+  }
+}

+package org.thingsboard.server.dao.yunteng.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.yunteng.dto.SysAppDesignDTO;
+import org.thingsboard.server.dao.yunteng.entities.SysAppDesign;
+import org.thingsboard.server.dao.yunteng.mapper.SysAppDesignMapper;
+import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.SysAppDesignService;
+
+/**
+ * @author: 徐浩然
+ * @desc: APP定制
+ * @date: 2021/12/3-18:40
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class SysAppDesignServiceImpl extends AbstractBaseService<SysAppDesignMapper, SysAppDesign>
+    implements SysAppDesignService {
+  @Override
+  public boolean save(SysAppDesignDTO sysAppDesignDTO,String tenantId) {
+    if (get(tenantId) != null) {
+      return false;
+    }
+    SysAppDesign entity = sysAppDesignDTO.getEntity(SysAppDesign.class);
+    entity.setTenantCode(tenantId);
+    return baseMapper.insert(entity) > 0;
+  }
+
+  @Override
+  public SysAppDesignDTO get(String tenantId) {
+    SysAppDesign sysAppDesign = baseMapper
+            .selectOne(
+                    new LambdaQueryWrapper<SysAppDesign>()
+                            .eq(SysAppDesign::getTenantCode, tenantId));
+    return sysAppDesign == null ? null : sysAppDesign.getDTO(SysAppDesignDTO.class);
+  }
+
+  @Override
+  public boolean update(SysAppDesignDTO sysAppDesignDTO,String tenantId) {
+    if (get(tenantId) != null) {
+      return baseMapper.update(
+              sysAppDesignDTO.getEntity(SysAppDesign.class),
+              new LambdaQueryWrapper<SysAppDesign>()
+                      .eq(SysAppDesign::getTenantCode, tenantId))
+              > 0;
+    }else {
+      return save(sysAppDesignDTO,tenantId);
+    }
+  }
+}

+package org.thingsboard.server.dao.yunteng.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.thingsboard.server.common.data.yunteng.core.exception.DataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+import org.thingsboard.server.common.data.yunteng.dto.SysDictItemDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.PageData;
+import org.thingsboard.server.dao.yunteng.entities.SysDictItem;
+import org.thingsboard.server.dao.yunteng.mapper.SysDictItemMapper;
+import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.SysDictItemService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class SysDictItemServiceImpl extends AbstractBaseService<SysDictItemMapper, SysDictItem>
+    implements SysDictItemService {
+
+  @Override
+  public PageData<SysDictItemDTO> page(Map<String, Object> queryMap) {
+    if (StringUtils.isEmpty((CharSequence) queryMap.get("dictId"))) {
+      throw new DataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    IPage<SysDictItem> iPage =
+        baseMapper.selectPage(
+            getPage(queryMap, "create_time", false),
+            new QueryWrapper<SysDictItem>()
+                .lambda()
+                .like(
+                    queryMap.get("itemText") != null,
+                    SysDictItem::getItemText,
+                    String.valueOf(queryMap.get("itemText")))
+                .eq(
+                    queryMap.get("dictId") != null,
+                    SysDictItem::getDictId,
+                    String.valueOf(queryMap.get("dictId"))));
+    return getPageData(iPage, SysDictItemDTO.class);
+  }
+
+  @Override
+  @Transactional
+  public SysDictItemDTO saveSysDictItem(SysDictItemDTO sysDictItemDTO,String tenantId) {
+    SysDictItem sysDictItem = new SysDictItem();
+    sysDictItemDTO.copyToEntity(sysDictItem);
+    sysDictItem.setTenantCode(tenantId);
+    baseMapper.insert(sysDictItem);
+    sysDictItem.copyToDTO(sysDictItemDTO);
+    return sysDictItemDTO;
+  }
+
+  @Override
+  @Transactional
+  public boolean deleteSysDictItem(Set<String> sysDictItemIds) {
+    return baseMapper.deleteBatchIds(sysDictItemIds) > 0;
+  }
+
+  @Override
+  @Transactional
+  public SysDictItemDTO updateSysDictItem(SysDictItemDTO sysDictItemDTO,String tenantId) {
+    SysDictItem sysDictItem = baseMapper.selectById(sysDictItemDTO.getId());
+    sysDictItemDTO.copyToEntity(sysDictItem);
+    sysDictItem.setTenantCode(tenantId);
+    baseMapper.updateById(sysDictItem);
+    sysDictItem.copyToDTO(sysDictItemDTO);
+    return sysDictItemDTO;
+  }
+
+  @Override
+  public List<SysDictItemDTO> findDictItemByDictCode(String dictCode) {
+    if (StringUtils.isEmpty(dictCode)) {
+      throw new DataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    return baseMapper.getDictItemInfo(null, dictCode);
+  }
+}

+package org.thingsboard.server.dao.yunteng.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.thingsboard.server.common.data.yunteng.core.exception.DataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+import org.thingsboard.server.common.data.yunteng.dto.SysDictDTO;
+import org.thingsboard.server.common.data.yunteng.dto.SysDictItemDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.PageData;
+import org.thingsboard.server.dao.yunteng.entities.SysDict;
+import org.thingsboard.server.dao.yunteng.mapper.SysDictItemMapper;
+import org.thingsboard.server.dao.yunteng.mapper.SysDictMapper;
+import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.SysDictService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class SysDictServiceImpl extends AbstractBaseService<SysDictMapper, SysDict>
+    implements SysDictService {
+
+  private final SysDictItemMapper sysDictItemMapper;
+
+  @Override
+  public PageData<SysDictDTO> page(Map<String, Object> queryMap) {
+    IPage<SysDict> iPage =
+        baseMapper.selectPage(
+            getPage(queryMap, "create_time", false),
+            new QueryWrapper<SysDict>()
+                .lambda()
+                .like(
+                    queryMap.get("dictName") != null,
+                    SysDict::getDictName,
+                    String.valueOf(queryMap.get("dictName")))
+                .like(
+                    queryMap.get("dictCode") != null,
+                    SysDict::getDictCode,
+                    String.valueOf(queryMap.get("dictCode"))));
+    return getPageData(iPage, SysDictDTO.class);
+  }
+
+  @Override
+  @Transactional
+  public SysDictDTO saveSysDict(SysDictDTO sysDictDTO,String tenantId) {
+    // 新增之前先判断该租户是否已添加
+    SysDictDTO querySysDict = baseMapper.getDictInfoByCode(tenantId, sysDictDTO.getDictCode());
+    if (querySysDict != null) {
+      throw new DataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    SysDict sysDict = new SysDict();
+    sysDictDTO.copyToEntity(sysDict);
+    sysDict.setTenantCode(tenantId);
+    baseMapper.insert(sysDict);
+    sysDict.copyToDTO(sysDictDTO);
+    return sysDictDTO;
+  }
+
+  @Override
+  @Transactional
+  public boolean deleteSysDict(Set<String> sysDictIds) {
+    for (String id : sysDictIds) {
+      List<SysDictItemDTO> sysDictItemDTO =
+          sysDictItemMapper.getDictItemInfo(id,null);
+      if (sysDictItemDTO != null) {
+        throw new DataValidationException(
+            "There is a relationship between superiors and subordinates");
+      }
+    }
+    return baseMapper.deleteBatchIds(sysDictIds) > 0;
+  }
+
+  @Override
+  @Transactional
+  public SysDictDTO updateSysDict(SysDictDTO sysDictDTO,String tenantId) {
+    SysDict sysDict = baseMapper.selectById(sysDictDTO.getId());
+    sysDictDTO.copyToEntity(sysDict);
+    sysDict.setTenantCode(tenantId);
+    baseMapper.updateById(sysDict);
+    sysDict.copyToDTO(sysDictDTO);
+    return sysDictDTO;
+  }
+}

+package org.thingsboard.server.dao.yunteng.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.yunteng.dto.SysEnterpriseDTO;
+import org.thingsboard.server.dao.yunteng.entities.SysEnterprise;
+import org.thingsboard.server.dao.yunteng.mapper.SysEnterpriseMapper;
+import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.SysEnterpriseService;
+
+/**
+ * @author: 徐浩然
+ * @desc: 企业信息
+ * @date: 2021/12/3-18:40
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class SysEnterpriseServiceImpl
+    extends AbstractBaseService<SysEnterpriseMapper, SysEnterprise>
+    implements SysEnterpriseService {
+  @Override
+  public boolean save(SysEnterpriseDTO sysAppDesignDTO,String tenantId) {
+    SysEnterprise entity = sysAppDesignDTO.getEntity(SysEnterprise.class);
+    entity.setTenantCode(tenantId);
+    return baseMapper.insert(entity) > 0;
+  }
+
+  @Override
+  public SysEnterpriseDTO get(String tenantId) {
+    SysEnterprise sysEnterprise = baseMapper.get(tenantId).getEntity(SysEnterprise.class);
+    return sysEnterprise == null ? null : sysEnterprise.getDTO(SysEnterpriseDTO.class);
+  }
+
+  @Override
+  public boolean update(SysEnterpriseDTO sysAppDesignDTO,String tenantId) {
+    if (get(tenantId) != null) {
+      return baseMapper.update(
+              sysAppDesignDTO.getEntity(SysEnterprise.class),
+              new LambdaQueryWrapper<SysEnterprise>()
+                      .eq(SysEnterprise::getTenantCode,tenantId))
+              > 0;
+    }else {
+      return save(sysAppDesignDTO,tenantId);
+    }
+  }
+}

+package org.thingsboard.server.dao.yunteng.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
+import org.thingsboard.server.common.data.yunteng.core.exception.EntityCreationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+import org.thingsboard.server.common.data.yunteng.dto.SysNoticeDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.PageData;
+import org.thingsboard.server.dao.yunteng.entities.SysNotice;
+import org.thingsboard.server.dao.yunteng.entities.SysNoticeUser;
+import org.thingsboard.server.dao.yunteng.entities.User;
+import org.thingsboard.server.dao.yunteng.mapper.SysNoticeMapper;
+import org.thingsboard.server.dao.yunteng.mapper.UserMapper;
+import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.SysNoticeService;
+import org.thingsboard.server.dao.yunteng.service.UserOrganizationMappingService;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @author: 徐浩然
+ * @desc: 通知管理
+ * @date: 2021/12/2-11:09
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class SysNoticeServiceImpl extends AbstractBaseService<SysNoticeMapper, SysNotice>
+    implements SysNoticeService {
+
+  private final SysNoticeUserServiceImpl sysNoticeUserService;
+  private final UserOrganizationMappingService userOrganizationMappingService;
+  private final UserMapper userMapper;
+
+  @Override
+  public PageData<SysNoticeDTO> page(Map<String, Object> queryMap) {
+    IPage<SysNotice> sysNoticeIPage =
+        getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, true);
+    sysNoticeIPage = baseMapper.page(sysNoticeIPage, queryMap);
+    return getPageData(sysNoticeIPage, SysNoticeDTO.class);
+  }
+
+  @Override
+  public SysNoticeDTO get(String id,String tenantId) {
+    return baseMapper
+        .get(id, tenantId)
+        .getDTO(SysNoticeDTO.class);
+  }
+
+  @Override
+  public boolean delete(List<String> ids,String tenantId) {
+    return baseMapper.delete(
+            new LambdaQueryWrapper<SysNotice>()
+                .in(SysNotice::getId, ids)
+                .eq(SysNotice::getTenantCode, tenantId))
+        > 0;
+  }
+
+  @Override
+  public SysNotice save(SysNoticeDTO sysNoticeDTO,String tenantId) {
+    SysNotice entity = sysNoticeDTO.getEntity(SysNotice.class);
+    // 设置为草稿
+    entity.setStatus(FastIotConstants.DraftStatus.DRAFT);
+    entity.setTenantCode(tenantId);
+    // 拼接需要发送的名单
+    if (sysNoticeDTO.getReceiverType() == null || sysNoticeDTO.getPointId() == null) {
+      throw new EntityCreationException(ErrorMessage.SEND_DESTINATION_NOT_FOUND.name());
+    }
+    LambdaQueryWrapper<User> wrapper =
+        new LambdaQueryWrapper<User>().eq(User::getTenantCode, entity.getTenantCode());
+    switch (entity.getReceiverType()) {
+      case FastIotConstants.ReceiverType.ALL:
+        // 全部
+        entity.setReceiverTypeIds(
+            userMapper.selectList(wrapper).stream()
+                .map(User::getId)
+                .collect(Collectors.joining(",")));
+        break;
+      case FastIotConstants.ReceiverType.ORGANIZATION:
+        // 组织内
+        entity.setReceiverTypeIds(
+            userOrganizationMappingService
+                .getUserIdByOrganizationIds(tenantId,sysNoticeDTO.getPointId().toArray(String[]::new))
+                .stream()
+                .collect(Collectors.joining(",")));
+        break;
+        //      case FastIotConstants.ReceiverType.DEPARTMENT:
+        //        // 部门
+        //        entity.setReceiverTypeIds(
+        //            userMapper.selectList(wrapper.in(User::getDeptId,
+        // sysNoticeDTO.getPointId())).stream()
+        //                .map(User::getId)
+        //                .collect(Collectors.joining(",")));
+        //        break;
+      case FastIotConstants.ReceiverType.PERSONAL:
+        // 个人
+        entity.setReceiverTypeIds(
+            sysNoticeDTO.getPointId().stream().collect(Collectors.joining(",")));
+        break;
+      default:
+        throw new EntityCreationException(ErrorMessage.SEND_DESTINATION_NOT_FOUND.name());
+    }
+    if (StringUtils.isEmpty(entity.getReceiverTypeIds())) {
+      throw new EntityCreationException(ErrorMessage.SEND_DESTINATION_NOT_FOUND.name());
+    }
+
+    if (entity.getId() == null) {
+      return baseMapper.insert(entity) > 0 ? entity : null;
+    } else {
+      return baseMapper.updateById(entity) > 0 ? entity : null;
+    }
+  }
+
+  @Override
+  @Transactional
+  public SysNotice send(SysNoticeDTO sysNoticeDTO,String tenantId,String currentUserId,String currentUserName) {
+    SysNotice save = null;
+    // 没有传id则证明不存在需要新增一下
+    if (StringUtils.isEmpty(sysNoticeDTO.getId())) {
+      save = save(sysNoticeDTO,tenantId);
+      if (save == null) {
+        return null;
+      }
+    }
+    save.setStatus(FastIotConstants.DraftStatus.PUBLISHED);
+    save.setSenderName(currentUserName);
+    save.setCreator(currentUserId);
+    save.setSenderDate(LocalDateTime.now());
+    int update =
+        baseMapper.update(
+            save,
+            new LambdaQueryWrapper<SysNotice>()
+                .eq(SysNotice::getId, save.getId())
+                .eq(SysNotice::getTenantCode,tenantId));
+    if (update > 0) {
+      // 发送消息
+      String[] split = save.getReceiverTypeIds().split(",");
+      List<SysNoticeUser> list = new ArrayList<>(split.length);
+      for (int i = 0; i < split.length; i++) {
+        SysNoticeUser sysNoticeUser = new SysNoticeUser();
+        sysNoticeUser.setReceiverId(split[i]);
+        sysNoticeUser.setNoticeId(save.getId());
+        sysNoticeUser.setTenantCode(save.getTenantCode());
+        sysNoticeUser.setReadStatus(FastIotConstants.ReadState.UNREAD);
+        list.add(sysNoticeUser);
+      }
+      if (ObjectUtils.isEmpty(list) || !sysNoticeUserService.insertBatch(list, 100)) {
+        // 通知失败
+        throw new EntityCreationException(ErrorMessage.SEND_DESTINATION_NOT_FOUND.name());
+      }
+    }
+    return save;
+  }
+}

+package org.thingsboard.server.dao.yunteng.impl;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
+import org.thingsboard.server.common.data.yunteng.dto.SysNoticeUserDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.PageData;
+import org.thingsboard.server.dao.yunteng.entities.SysNoticeUser;
+import org.thingsboard.server.dao.yunteng.mapper.SysNoticeUserMapper;
+import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.SysNoticeUserService;
+
+import java.time.LocalDateTime;
+import java.util.Map;
+
+/**
+ * @author: 徐浩然
+ * @desc: 我的通知
+ * @date: 2021/12/2-20:43
+ */
+@Service
+public class SysNoticeUserServiceImpl
+    extends AbstractBaseService<SysNoticeUserMapper, SysNoticeUser>
+    implements SysNoticeUserService {
+
+  @Override
+  public PageData<SysNoticeUserDTO> page(Map<String, Object> queryMap) {
+    return getPage(queryMap);
+  }
+
+  @Override
+  public PageData<SysNoticeUserDTO> read(Map<String, Object> queryMap,String currentUserId) {
+    queryMap.put("creator", currentUserId);
+    return getPage(queryMap);
+  }
+
+  @Override
+  public SysNoticeUserDTO get(String id,String tenantId) {
+    SysNoticeUser sysNoticeUser =
+        baseMapper.get(id, tenantId).getEntity(SysNoticeUser.class);
+    if (!FastIotConstants.ReadState.READ.equals(sysNoticeUser.getReadStatus()) || sysNoticeUser.getReadDate() == null) {
+      // 设置已读
+      sysNoticeUser.setReadStatus(FastIotConstants.ReadState.READ);
+      sysNoticeUser.setReadDate(LocalDateTime.now());
+      baseMapper.update(
+          null,
+          new LambdaUpdateWrapper<SysNoticeUser>()
+              .eq(SysNoticeUser::getId, sysNoticeUser.getId())
+              .set(SysNoticeUser::getReadStatus, sysNoticeUser.getReadStatus())
+              .set(SysNoticeUser::getReadDate, sysNoticeUser.getReadDate()));
+    }
+    return sysNoticeUser.getDTO(SysNoticeUserDTO.class);
+  }
+
+  private PageData<SysNoticeUserDTO> getPage(Map<String, Object> queryMap) {
+    IPage<SysNoticeUser> page = getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, true);
+    IPage<SysNoticeUserDTO> sysNoticeUserPage = baseMapper.page(page, queryMap);
+    return getPageData(sysNoticeUserPage, SysNoticeUserDTO.class);
+  }
+}

+package org.thingsboard.server.dao.yunteng.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.yunteng.dto.SysPlatformDesignDTO;
+import org.thingsboard.server.dao.yunteng.entities.SysPlatformDesign;
+import org.thingsboard.server.dao.yunteng.mapper.SysPlatformDesignMapper;
+import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.SysPlatformDesignService;
+
+/**
+ * @author: 徐浩然
+ * @desc: 平台定制
+ * @date: 2021/12/3-18:41
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class SysPlatformDesignServiceImpl
+    extends AbstractBaseService<SysPlatformDesignMapper, SysPlatformDesign>
+    implements SysPlatformDesignService {
+    @Override
+    public boolean save(SysPlatformDesignDTO sysAppDesignDTO,String tenantId) {
+        SysPlatformDesign entity = sysAppDesignDTO.getEntity(SysPlatformDesign.class);
+        entity.setTenantCode(tenantId);
+        return baseMapper.insert(entity) > 0;
+    }
+
+    @Override
+    public SysPlatformDesignDTO get(String tenantId) {
+        SysPlatformDesign sysPlatformDesign = baseMapper
+                .selectOne(
+                        new LambdaQueryWrapper<SysPlatformDesign>()
+                                .eq(SysPlatformDesign::getTenantCode, tenantId));
+        return sysPlatformDesign == null ? null : sysPlatformDesign.getDTO(SysPlatformDesignDTO.class);
+    }
+
+    @Override
+    public boolean update(SysPlatformDesignDTO sysAppDesignDTO,String tenantId) {
+        if (get(tenantId) != null) {
+            return baseMapper.update(
+                    sysAppDesignDTO.getEntity(SysPlatformDesign.class),
+                    new LambdaQueryWrapper<SysPlatformDesign>()
+                            .eq(SysPlatformDesign::getTenantCode, tenantId))
+                    > 0;
+        }else {
+            return save(sysAppDesignDTO,tenantId);
+        }
+    }
+}

+package org.thingsboard.server.dao.yunteng.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.dao.yunteng.entities.SysTown;
+import org.thingsboard.server.dao.yunteng.mapper.SysTownMapper;
+import org.thingsboard.server.dao.yunteng.service.SysTownService;
+
+import java.lang.reflect.Field;
+import java.util.List;
+import java.util.Stack;
+
+/**
+ * @author: 徐浩然
+ * @desc: 中国城镇区街
+ * @date: 2021/12/3-15:37
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class SysTownServiceImpl implements SysTownService {
+
+  private final SysTownMapper sysTownMapper;
+
+  @Override
+  public List<SysTown> findChilds(String variable, String value) {
+    Field[] fields = SysTown.class.getDeclaredFields();
+    Stack<String> list = new Stack<>();
+    for (int i = 0; i < fields.length; i++) {
+      // 查询variable是第几个变量，可以决定groupby什么
+      list.add(fields[i].getName());
+      if (fields[i].getName().equals(variable)) {
+        if (i % 2 == 0) {
+          list.add(fields[++i].getName());
+        }
+        list.add(fields[++i].getName());
+        list.add(fields[++i].getName());
+        break;
+      }
+    }
+    String[] groupBy =
+        list.stream()
+            // 驼峰转下划线
+            .map(this::to_)
+            // 组成需要groupby的字段
+            .toArray(String[]::new);
+    return sysTownMapper.selectList(
+        new QueryWrapper<SysTown>()
+            .select(groupBy)
+            .eq(to_(variable), value)
+            .groupBy(groupBy));
+  }
+
+  private String to_(String s){
+    return s.replaceAll("[A-Z]", "_$0").toLowerCase();
+  }
+
+  @Override
+  public SysTown findParent(String variable, String value) {
+    return sysTownMapper.selectList(new QueryWrapper<SysTown>().eq(variable, value)).stream()
+        .findFirst()
+        .orElse(null);
+  }
+
+  public List<SysTown> getCityList() {
+    return sysTownMapper.getCityList();
+  }
+}

+package org.thingsboard.server.dao.yunteng.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO;
+import org.thingsboard.server.dao.yunteng.entities.UserOrganizationMapping;
+import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
+import org.thingsboard.server.dao.yunteng.mapper.UserOrganizationMappingMapper;
+import org.thingsboard.server.dao.yunteng.service.UserOrganizationMappingService;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author: 徐浩然
+ * @desc: 组织用户关联表
+ * @date: 2021/12/3-10:18
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class UserOrganizationMappingServiceImpl implements UserOrganizationMappingService {
+
+  private final UserOrganizationMappingMapper userOrganizationMappingMapper;
+  private final OrganizationMapper organizationMapper;
+
+  @Override
+  public List<String> getUserIdByOrganizationIds(String tenantId,String... ids) {
+    List<String> collect =
+        organizationMapper
+            .findOrganizationTreeList(
+                    tenantId, List.of(ids))
+            .stream()
+            .map(OrganizationDTO::getId)
+            .collect(Collectors.toList());
+    if (ObjectUtils.isEmpty(collect)) {
+      return new ArrayList<>();
+    } else {
+      return userOrganizationMappingMapper
+          .selectList(
+              new LambdaQueryWrapper<UserOrganizationMapping>()
+                  .in(UserOrganizationMapping::getOrganizationId, collect))
+          .stream()
+          .map(UserOrganizationMapping::getUserId)
+          .collect(Collectors.toList());
+    }
+  }
+}

@@ -36,7 +36,7 @@ public class YtOrganizationServiceImpl extends AbstractBaseService<OrganizationM
 
 
   @Override
   @Override
   @Transactional
   @Transactional
-  public OrganizationDTO saveOrganization(OrganizationDTO organizationDTO) {
+  public OrganizationDTO saveOrganization(OrganizationDTO organizationDTO,String tenantId) {
     Assert.notNull(organizationDTO.getName(), "organization name cannot be null");
     Assert.notNull(organizationDTO.getName(), "organization name cannot be null");
     if (StringUtils.isNotBlank(organizationDTO.getParentId())) {
     if (StringUtils.isNotBlank(organizationDTO.getParentId())) {
       Organization organization = baseMapper.selectById(organizationDTO.getParentId());
       Organization organization = baseMapper.selectById(organizationDTO.getParentId());
@@ -51,7 +51,7 @@ public class YtOrganizationServiceImpl extends AbstractBaseService<OrganizationM
       }
       }
     }
     }
     Organization organization = new Organization();
     Organization organization = new Organization();
-    //organizationDTO.setTenantCode(getCurrentUser().getTenantCode());
+    organizationDTO.setTenantCode(tenantId);
     organizationDTO.copyToEntity(organization, "id");
     organizationDTO.copyToEntity(organization, "id");
     baseMapper.insert(organization);
     baseMapper.insert(organization);
     organization.copyToDTO(organizationDTO);
     organization.copyToDTO(organizationDTO);
@@ -60,7 +60,7 @@ public class YtOrganizationServiceImpl extends AbstractBaseService<OrganizationM
 
 
   @Override
   @Override
   @Transactional
   @Transactional
-  public boolean deleteOrganizations(DeleteDTO deleteDTO) {
+  public boolean deleteOrganizations(DeleteDTO deleteDTO,String tenantId) {
     if(null == deleteDTO || deleteDTO.getIds().isEmpty()){
     if(null == deleteDTO || deleteDTO.getIds().isEmpty()){
       throw new DataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
       throw new DataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
     }
@@ -92,7 +92,7 @@ public class YtOrganizationServiceImpl extends AbstractBaseService<OrganizationM
 //    if (!deviceList.isEmpty()) {
 //    if (!deviceList.isEmpty()) {
 //      throw new DataValidationException("待删除数据存在关联设备,不能删除!");
 //      throw new DataValidationException("待删除数据存在关联设备,不能删除!");
 //    }
 //    }
-//    doDeleteUserOrganizationMapping(idToDelete);
+    doDeleteUserOrganizationMapping(idToDelete);
     return baseMapper.deleteBatchIds(idToDelete)>0;
     return baseMapper.deleteBatchIds(idToDelete)>0;
   }
   }
 
 

@@ -59,8 +59,8 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User> imp
   private final TenantRoleMapper tenantRoleMapper;
   private final TenantRoleMapper tenantRoleMapper;
 
 
   private final YtSmsService ytSmsService;
   private final YtSmsService ytSmsService;
-  private final YtMessageTemplateService messageTemplateService;
-  private final YtOrganizationService groupService;
+  private final MessageTemplateService messageTemplateService;
+  private final OrganizationService groupService;
 
 
   public static final String ACTIVATE_URL_PATTERN = "%s/api/noauth/activate?activateToken=%s";
   public static final String ACTIVATE_URL_PATTERN = "%s/api/noauth/activate?activateToken=%s";
   private final PasswordEncoder passwordEncoder;
   private final PasswordEncoder passwordEncoder;
@@ -75,8 +75,8 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User> imp
 
 
   @Override
   @Override
   @Transactional
   @Transactional
-  public UserDTO saveAccount(UserDTO userDTO, boolean sendEmail, boolean sendMsg,boolean isSysadmin,String tenantId) {
-    boolean isAdminOperate = isSysadmin;
+  public UserDTO saveAccount(UserDTO userDTO, boolean sendEmail, boolean sendMsg,boolean isPtSysadmin,String tenantId) {
+    boolean isAdminOperate = isPtSysadmin;
     if (StringUtils.isAllBlank(userDTO.getUsername())) {
     if (StringUtils.isAllBlank(userDTO.getUsername())) {
       throw new DataValidationException("username is required");
       throw new DataValidationException("username is required");
     }
     }
@@ -98,7 +98,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User> imp
     if (isAdminOperate) {
     if (isAdminOperate) {
       // 添加的租户管理员
       // 添加的租户管理员
       if (StringUtils.isNotBlank(userDTO.getTenantCode())) {
       if (StringUtils.isNotBlank(userDTO.getTenantCode())) {
-        user.setTenantId(userDTO.getTenantCode());
+        user.setTenantCode(userDTO.getTenantCode());
         user.setPassword(passwordEncoder.encode(DEFAULT_PWD));
         user.setPassword(passwordEncoder.encode(DEFAULT_PWD));
         int tenantExist =
         int tenantExist =
             tenantMapper.selectCount(
             tenantMapper.selectCount(
@@ -111,24 +111,24 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User> imp
       } else {
       } else {
         // 添加的平台系统其他用户
         // 添加的平台系统其他用户
         user.setLevel(FastIotConstants.LevelValue.IS_OTHER_ADMIN);
         user.setLevel(FastIotConstants.LevelValue.IS_OTHER_ADMIN);
-        user.setTenantId(tenantId);
+        user.setTenantCode(tenantId);
       }
       }
       userExist =
       userExist =
           baseMapper.selectCount(
           baseMapper.selectCount(
                   new QueryWrapper<User>()
                   new QueryWrapper<User>()
                       .lambda()
                       .lambda()
                       .eq(User::getUsername, userDTO.getUsername())
                       .eq(User::getUsername, userDTO.getUsername())
-                      .eq(User::getTenantId, userDTO.getTenantCode()))
+                      .eq(User::getTenantCode, userDTO.getTenantCode()))
               > 0;
               > 0;
     } else {
     } else {
       user.setLevel(FastIotConstants.LevelValue.IS_NORMAL);
       user.setLevel(FastIotConstants.LevelValue.IS_NORMAL);
-      user.setTenantId(tenantId);
+      user.setTenantCode(tenantId);
       userExist =
       userExist =
           baseMapper.selectCount(
           baseMapper.selectCount(
                   new QueryWrapper<User>()
                   new QueryWrapper<User>()
                       .lambda()
                       .lambda()
                       .eq(User::getUsername, userDTO.getUsername())
                       .eq(User::getUsername, userDTO.getUsername())
-                      .eq(User::getTenantId, tenantId))
+                      .eq(User::getTenantCode, tenantId))
               > 0;
               > 0;
     }
     }
     if (userExist) {
     if (userExist) {
@@ -167,10 +167,10 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User> imp
   }
   }
 
 
   @Override
   @Override
-  public String getActivationLink(String userId,boolean isSysadmin,String tenantId) {
+  public String getActivationLink(String userId,boolean isPtSysadmin,String tenantId) {
     User user = baseMapper.selectById(userId);
     User user = baseMapper.selectById(userId);
-    if (!isSysadmin
-        && tenantId.equals(user.getTenantId())) {
+    if (!isPtSysadmin
+        && tenantId.equals(user.getTenantCode())) {
       throw new AccessDeniedException(
       throw new AccessDeniedException(
           "you don't have permission to get activation link for this user");
           "you don't have permission to get activation link for this user");
     }
     }
@@ -218,13 +218,13 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User> imp
   }
   }
 
 
   @Override
   @Override
-  public Optional<UserDTO> getUser(String userId,boolean isSysadmin,String tenantId) {
+  public Optional<UserDTO> getUser(String userId,boolean isPtSysadmin,String tenantId) {
     User user = baseMapper.selectById(userId);
     User user = baseMapper.selectById(userId);
     if (user != null) {
     if (user != null) {
       UserDTO userDTO = new UserDTO();
       UserDTO userDTO = new UserDTO();
       user.copyToDTO(userDTO, PASSWORD, ACTIVATE_TOKEN);
       user.copyToDTO(userDTO, PASSWORD, ACTIVATE_TOKEN);
-      if (!isSysadmin
-          && !tenantId.equals(user.getTenantId())) {
+      if (!isPtSysadmin
+          && !tenantId.equals(user.getTenantCode())) {
         return Optional.empty();
         return Optional.empty();
       }
       }
       return Optional.of(userDTO);
       return Optional.of(userDTO);
@@ -235,11 +235,11 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User> imp
 
 
   @Override
   @Override
   @Transactional
   @Transactional
-  public UserDTO updateUser(UserDTO userDTO,boolean isSysadmin,String tenantId) {
+  public UserDTO updateUser(UserDTO userDTO,boolean isPtSysadmin,String tenantId) {
     Assert.notNull(userDTO.getId(), "user is must be specified");
     Assert.notNull(userDTO.getId(), "user is must be specified");
     User user = baseMapper.selectById(userDTO.getId());
     User user = baseMapper.selectById(userDTO.getId());
-    if (!isSysadmin
-        && !user.getTenantId().equals(tenantId)) {
+    if (!isPtSysadmin
+        && !user.getTenantCode().equals(tenantId)) {
       throw new NoneTenantAssetException("this user not belong to current tenant");
       throw new NoneTenantAssetException("this user not belong to current tenant");
     }
     }
     if (!user.getUsername().equals(userDTO.getUsername())) {
     if (!user.getUsername().equals(userDTO.getUsername())) {
@@ -262,13 +262,13 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User> imp
   @Override
   @Override
   public PageData<UserDTO> page(
   public PageData<UserDTO> page(
       Map<String, Object> queryMap,
       Map<String, Object> queryMap,
-      boolean isSysadmin,
+      boolean isPtSysadmin,
       boolean isPlatformAdmin,
       boolean isPlatformAdmin,
       boolean isTenantAdmin,
       boolean isTenantAdmin,
       String tenantId) {
       String tenantId) {
     IPage<UserDTO> userPage = new Page<>();
     IPage<UserDTO> userPage = new Page<>();
     IPage<User> userIPage = getPage(queryMap, "create_time", true);
     IPage<User> userIPage = getPage(queryMap, "create_time", true);
-    if (isSysadmin) {
+    if (isPtSysadmin) {
       String roleType = (String) queryMap.get("roleType");
       String roleType = (String) queryMap.get("roleType");
       if (StringUtils.isEmpty(roleType)) {
       if (StringUtils.isEmpty(roleType)) {
         roleType = RoleEnum.ROLE_PLATFORM_ADMIN.name();
         roleType = RoleEnum.ROLE_PLATFORM_ADMIN.name();
@@ -318,14 +318,14 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User> imp
 
 
   @Override
   @Override
   @Transactional
   @Transactional
-  public boolean deleteUser(Set<String> userIds,boolean isSysadmin,String tenantId) {
+  public boolean deleteUser(Set<String> userIds,boolean isPtSysadmin,String tenantId) {
     // 1. 判断是否所有的id都属于此人
     // 1. 判断是否所有的id都属于此人
-    if (!isSysadmin) {
+    if (!isPtSysadmin) {
       int notTenantUserCount =
       int notTenantUserCount =
           baseMapper.selectCount(
           baseMapper.selectCount(
               new QueryWrapper<User>()
               new QueryWrapper<User>()
                   .lambda()
                   .lambda()
-                  .ne(User::getTenantId, tenantId)
+                  .ne(User::getTenantCode, tenantId)
                   .in(User::getId, userIds));
                   .in(User::getId, userIds));
       if (notTenantUserCount > 0) {
       if (notTenantUserCount > 0) {
         throw new AccessDeniedException("cannot delete user that not belong to your tenant");
         throw new AccessDeniedException("cannot delete user that not belong to your tenant");
@@ -346,9 +346,9 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User> imp
 
 
   @Override
   @Override
   @Transactional
   @Transactional
-  public UserDTO saveTenantAdmin(UserDTO userDTO,boolean isSysadmin,String tenantId) {
+  public UserDTO saveTenantAdmin(UserDTO userDTO,boolean isPtSysadmin,String tenantId) {
     if (StringUtils.isNotBlank(userDTO.getId())) {
     if (StringUtils.isNotBlank(userDTO.getId())) {
-      return updateUser(userDTO,isSysadmin,tenantId);
+      return updateUser(userDTO,isPtSysadmin,tenantId);
     }
     }
     validatePhoneNumberAndEmail(userDTO);
     validatePhoneNumberAndEmail(userDTO);
     User user = new User();
     User user = new User();
@@ -379,8 +379,8 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User> imp
 
 
   @Override
   @Override
   @Transactional
   @Transactional
-  public void resetPassword(String userId,boolean isSysadmin,String tenantId) {
-    if (isSysadmin) {
+  public void resetPassword(String userId,boolean isPtSysadmin,String tenantId) {
+    if (isPtSysadmin) {
       baseMapper.setPassword2NullAndInsertActiveToken(
       baseMapper.setPassword2NullAndInsertActiveToken(
           userId, RandomStringUtils.randomAlphabetic(10));
           userId, RandomStringUtils.randomAlphabetic(10));
     } else {
     } else {
@@ -388,7 +388,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User> imp
       if (user == null) {
       if (user == null) {
         return;
         return;
       }
       }
-      if (tenantId.equals(user.getTenantId())) {
+      if (tenantId.equals(user.getTenantCode())) {
         baseMapper.setPassword2NullAndInsertActiveToken(
         baseMapper.setPassword2NullAndInsertActiveToken(
             userId, RandomStringUtils.randomAlphabetic(10));
             userId, RandomStringUtils.randomAlphabetic(10));
       }
       }
@@ -434,7 +434,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User> imp
   public Optional<List<UserDTO>> getOrganizationUserByOrganizationId(String groupId,String tenantId) {
   public Optional<List<UserDTO>> getOrganizationUserByOrganizationId(String groupId,String tenantId) {
     Organization group = organizationMapper.selectById(groupId);
     Organization group = organizationMapper.selectById(groupId);
     if (group == null
     if (group == null
-        || !group.getTenantId().equals(tenantId)) {
+        || !group.getTenantCode().equals(tenantId)) {
       return Optional.empty();
       return Optional.empty();
     }
     }
     Set<String> userIds =
     Set<String> userIds =

+package org.thingsboard.server.dao.yunteng.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.thingsboard.server.dao.yunteng.entities.SysAppDesign;
+
+/**
+ * @author: 徐浩然
+ * @desc:
+ * @date: 2021/12/3-18:28
+ */
+@Mapper
+public interface SysAppDesignMapper extends BaseMapper<SysAppDesign> {}

+package org.thingsboard.server.dao.yunteng.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.thingsboard.server.common.data.yunteng.dto.SysEnterpriseDTO;
+import org.thingsboard.server.dao.yunteng.entities.SysEnterprise;
+
+/**
+ * @author: 徐浩然
+ * @desc: 企业信息
+ * @date: 2021/12/3-18:27
+ */
+@Mapper
+public interface SysEnterpriseMapper extends BaseMapper<SysEnterprise> {
+  /**
+   * @param tenantCode
+   * @return
+   */
+  SysEnterpriseDTO get(@Param("tenantCode") String tenantCode);
+}

+package org.thingsboard.server.dao.yunteng.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.thingsboard.server.dao.yunteng.entities.SysNotice;
+
+import java.util.Map;
+
+/**
+ * @author: 徐浩然
+ * @desc:
+ * @date: 2021/12/2-10:33
+ */
+@Mapper
+public interface SysNoticeMapper extends BaseMapper<SysNotice> {
+  /**
+   * @param page
+   * @param queryMap
+   * @return 系统通知分页
+   */
+  IPage<SysNotice> page(IPage<SysNotice> page, @Param("queryMap") Map<String, Object> queryMap);
+
+  /**
+   * @param id
+   * @return 消息详情
+   */
+  SysNotice get(@Param("id") String id, @Param("tenantCode") String tenantCode);
+}

+package org.thingsboard.server.dao.yunteng.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.thingsboard.server.common.data.yunteng.dto.SysNoticeUserDTO;
+import org.thingsboard.server.dao.yunteng.entities.SysNoticeUser;
+
+import java.util.Map;
+
+/**
+ * @author: 徐浩然
+ * @desc:
+ * @date: 2021/12/2-11:02
+ */
+@Mapper
+public interface SysNoticeUserMapper extends BaseMapper<SysNoticeUser> {
+  /**
+   * @param page
+   * @param queryMap
+   * @return 通知阅读记录分页
+   */
+  IPage<SysNoticeUserDTO> page(IPage<SysNoticeUser> page, @Param("queryMap") Map<String, Object> queryMap);
+
+  /**
+   * @param id
+   * @param tenantCode
+   * @return
+   */
+  SysNoticeUserDTO get(@Param("id") String id, @Param("tenantCode") String tenantCode);
+}

+package org.thingsboard.server.dao.yunteng.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.thingsboard.server.dao.yunteng.entities.SysPlatformDesign;
+
+/**
+ * @author: 徐浩然
+ * @desc:
+ * @date: 2021/12/3-18:28
+ */
+@Mapper
+public interface SysPlatformDesignMapper extends BaseMapper<SysPlatformDesign> {}

+package org.thingsboard.server.dao.yunteng.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+import org.thingsboard.server.dao.yunteng.entities.SysTown;
+
+import java.util.List;
+
+/**
+ * @author: 徐浩然
+ * @desc:
+ * @date: 2021/12/3-15:34
+ */
+@Mapper
+public interface SysTownMapper extends BaseMapper<SysTown> {
+  /** @return 查询所有省份 */
+  @Select("select name_prov,code_prov from sys_town group by name_prov, code_prov")
+  List<SysTown> getCityList();
+}

@@ -2,12 +2,19 @@ package org.thingsboard.server.dao.yunteng.service;
 
 
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.enums.SqlMethod;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.core.toolkit.GlobalConfigUtils;
+import com.baomidou.mybatisplus.core.toolkit.ReflectionKit;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.session.SqlSession;
+import org.mybatis.spring.SqlSessionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
@@ -15,6 +22,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.PageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TBPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TBPageData;
 import org.thingsboard.server.dao.yunteng.entities.BaseEntity;
 import org.thingsboard.server.dao.yunteng.entities.BaseEntity;
 
 
+import java.util.Collection;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
@@ -71,4 +79,61 @@ public abstract class AbstractBaseService<M extends BaseMapper<T>, T extends Bas
     List<D> targetList = ReflectUtils.sourceToTarget(tbPageData.getData(),target);
     List<D> targetList = ReflectUtils.sourceToTarget(tbPageData.getData(),target);
     return new PageData<>(targetList, tbPageData.getTotalElements());
     return new PageData<>(targetList, tbPageData.getTotalElements());
   }
   }
+
+
+  /**
+   * 批量插入
+   *
+   * @param entityList
+   * @param batchSize
+   * @return
+   */
+  @Transactional(rollbackFor = Exception.class)
+  public boolean insertBatch(Collection<T> entityList, int batchSize) {
+    SqlSession batchSqlSession = sqlSessionBatch();
+    int i = 0;
+    String sqlStatement = sqlStatement(SqlMethod.INSERT_ONE);
+    try {
+      for (T anEntityList : entityList) {
+        batchSqlSession.insert(sqlStatement, anEntityList);
+        if (i >= 1 && i % batchSize == 0) {
+          batchSqlSession.flushStatements();
+        }
+        i++;
+      }
+      batchSqlSession.flushStatements();
+    } finally {
+      closeSqlSession(batchSqlSession);
+    }
+    return true;
+  }
+  /**
+   * 获取SqlStatement
+   *
+   * @param sqlMethod
+   * @return
+   */
+  protected String sqlStatement(SqlMethod sqlMethod) {
+    return SqlHelper.table(currentModelClass()).getSqlStatement(sqlMethod.getMethod());
+  }
+
+  /** 批量操作 SqlSession */
+  protected SqlSession sqlSessionBatch() {
+    return SqlHelper.sqlSessionBatch(currentModelClass());
+  }
+
+  /**
+   * 释放sqlSession
+   *
+   * @param sqlSession session
+   */
+  protected void closeSqlSession(SqlSession sqlSession) {
+    SqlSessionUtils.closeSqlSession(
+            sqlSession, GlobalConfigUtils.currentSessionFactory(currentModelClass()));
+  }
+
+  protected Class<T> currentModelClass() {
+    return (Class<T>)
+            ReflectionKit.getSuperClassGenericType(getClass(), 1);
+  }
 }
 }

+package org.thingsboard.server.dao.yunteng.service;
+
+
+import org.thingsboard.server.common.data.yunteng.dto.SmsLogDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.PageData;
+
+import java.util.Map;
+import java.util.Set;
+
+public interface SmsLogService {
+    PageData<SmsLogDTO> page(Map<String, Object> queryMap,String tenantId);
+
+    boolean deleteSmsLog(Set<String> ids);
+}

+package org.thingsboard.server.dao.yunteng.service;
+
+
+import org.thingsboard.server.common.data.yunteng.dto.SysAppDesignDTO;
+
+/**
+ * @author: 徐浩然
+ * @desc:
+ * @date: 2021/12/3-18:40
+ */
+public interface SysAppDesignService {
+  boolean save(SysAppDesignDTO sysAppDesignDTO,String tenantId);
+
+  SysAppDesignDTO get(String tenantId);
+
+  boolean update(SysAppDesignDTO sysAppDesignDTO,String tenantId);
+}

+package org.thingsboard.server.dao.yunteng.service;
+
+
+import org.thingsboard.server.common.data.yunteng.dto.SysDictItemDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.PageData;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public interface SysDictItemService {
+    PageData<SysDictItemDTO> page(Map<String, Object> queryMap);
+
+    SysDictItemDTO saveSysDictItem(SysDictItemDTO sysDictItemDTO,String tenantId);
+
+    boolean deleteSysDictItem(Set<String> sysDictItemIds);
+
+    SysDictItemDTO updateSysDictItem(SysDictItemDTO sysDictItemDTO,String tenantId);
+
+    /**
+     * 查询字典code对应的所有字典值
+     * @param dictCode 字典code
+     * @return List<SysDictItemDTO>
+     */
+    List<SysDictItemDTO> findDictItemByDictCode(String dictCode);
+}

+package org.thingsboard.server.dao.yunteng.service;
+
+import org.thingsboard.server.common.data.yunteng.dto.SysDictDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.PageData;
+
+import java.util.Map;
+import java.util.Set;
+
+public interface SysDictService {
+    PageData<SysDictDTO> page(Map<String, Object> queryMap);
+
+    SysDictDTO saveSysDict(SysDictDTO sysDictDTO,String tenantId);
+
+    boolean deleteSysDict(Set<String> sysDictIds);
+
+    SysDictDTO updateSysDict(SysDictDTO sysDictDTO,String tenantId);
+}

+package org.thingsboard.server.dao.yunteng.service;
+
+
+import org.thingsboard.server.common.data.yunteng.dto.SysEnterpriseDTO;
+
+/**
+ * @author: 徐浩然
+ * @desc:
+ * @date: 2021/12/3-18:39
+ */
+public interface SysEnterpriseService {
+    boolean save(SysEnterpriseDTO sysEnterpriseDTO,String tenantId);
+
+    SysEnterpriseDTO get(String tenantId);
+
+    boolean update(SysEnterpriseDTO sysEnterpriseDTO,String tenantId);
+}

+package org.thingsboard.server.dao.yunteng.service;
+
+import org.thingsboard.server.common.data.yunteng.dto.SysNoticeDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.PageData;
+import org.thingsboard.server.dao.yunteng.entities.SysNotice;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author: 徐浩然
+ * @desc: 通知管理
+ * @date: 2021/12/2-11:07
+ */
+public interface SysNoticeService {
+
+  PageData<SysNoticeDTO> page(Map<String, Object> queryMap);
+
+  SysNoticeDTO get(String id,String tenantId);
+
+  boolean delete(List<String> ids,String tenantId);
+
+  SysNotice save(SysNoticeDTO sysNoticeDTO,String tenantId);
+
+  SysNotice send(SysNoticeDTO sysNoticeDTO,String tenantId,String currentUserId,String currentUserName);
+}

+package org.thingsboard.server.dao.yunteng.service;
+
+import org.thingsboard.server.common.data.yunteng.dto.SysNoticeUserDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.PageData;
+
+import java.util.Map;
+
+/**
+ * @author: 徐浩然
+ * @desc:
+ * @date: 2021/12/2-20:43
+ */
+public interface SysNoticeUserService {
+    PageData<SysNoticeUserDTO> page(Map<String, Object> queryMap);
+
+    PageData<SysNoticeUserDTO> read(Map<String, Object> queryMap,String currentUserId);
+
+    SysNoticeUserDTO get(String id,String tenantId);
+}

+package org.thingsboard.server.dao.yunteng.service;
+import org.thingsboard.server.common.data.yunteng.dto.SysPlatformDesignDTO;
+
+/**
+ * @author: 徐浩然
+ * @desc:
+ * @date: 2021/12/3-18:39
+ */
+public interface SysPlatformDesignService {
+    boolean save(SysPlatformDesignDTO sysPlatformDesignDTO,String tenantId);
+
+    SysPlatformDesignDTO get(String tenantId);
+
+    boolean update(SysPlatformDesignDTO sysPlatformDesignDTO,String tenantId);
+}

+package org.thingsboard.server.dao.yunteng.service;
+
+import org.thingsboard.server.dao.yunteng.entities.SysTown;
+
+import java.util.List;
+
+/**
+ * @author: 徐浩然
+ * @desc:
+ * @date: 2021/12/3-15:36
+ */
+public interface SysTownService {
+
+    List<SysTown> findChilds(String variable, String value);
+
+    SysTown findParent(String variable, String value);
+
+    List<SysTown> getCityList();
+}

+package org.thingsboard.server.dao.yunteng.service;
+
+import java.util.List;
+
+/**
+ * @author: 徐浩然
+ * @desc: 组织用户关联表
+ * @date: 2021/12/3-10:17
+ */
+public interface UserOrganizationMappingService {
+
+    List<String> getUserIdByOrganizationIds(String tenantId,String... ids);
+}

@@ -8,10 +8,10 @@ import org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO;
 import java.util.List;
 import java.util.List;
 import java.util.Set;
 import java.util.Set;
 
 
-public interface YtOrganizationService {
-  OrganizationDTO saveOrganization(OrganizationDTO organizationDTO);
+public interface OrganizationService {
+  OrganizationDTO saveOrganization(OrganizationDTO organizationDTO,String tenantId);
 
 
-  boolean deleteOrganizations(DeleteDTO deleteDTO);
+  boolean deleteOrganizations(DeleteDTO deleteDTO,String tenantId);
 
 
   List<OrganizationDTO> getMyOrganizations();
   List<OrganizationDTO> getMyOrganizations();
 
 

@@ -16,23 +16,23 @@ import java.util.Set;
 public interface YtUserService {
 public interface YtUserService {
   List<UserDetailsDTO> findUserDetailsByUsername(String username);
   List<UserDetailsDTO> findUserDetailsByUsername(String username);
 
 
-  UserDTO saveAccount(UserDTO userDTO, boolean sendEmail, boolean sendMsg,boolean isSysadmin,String tenantId);
+  UserDTO saveAccount(UserDTO userDTO, boolean sendEmail, boolean sendMsg,boolean isPtSysadmin,String tenantId);
 
 
-  String getActivationLink(String userId,boolean isSysadmin,String tenantId);
+  String getActivationLink(String userId,boolean isPtSysadmin,String tenantId);
 
 
-  Optional<UserDTO> getUser(String userId,boolean isSysadmin,String tenantId);
+  Optional<UserDTO> getUser(String userId,boolean isPtSysadmin,String tenantId);
 
 
   UserInfoDTO me(String userId,String tenantId,Set<String> currentRoles);
   UserInfoDTO me(String userId,String tenantId,Set<String> currentRoles);
 
 
-  PageData<UserDTO> page(Map<String, Object> queryMap,boolean isSysadmin,boolean isPlatformAdmin,boolean isTenantAdmin,String tenantId);
+  PageData<UserDTO> page(Map<String, Object> queryMap,boolean isPtSysadmin,boolean isPlatformAdmin,boolean isTenantAdmin,String tenantId);
 
 
-  UserDTO updateUser(UserDTO userDTO,boolean isSysadmin,String tenantId);
+  UserDTO updateUser(UserDTO userDTO,boolean isPtSysadmin,String tenantId);
 
 
-  boolean deleteUser(Set<String> userIds,boolean isSysadmin,String tenantId);
+  boolean deleteUser(Set<String> userIds,boolean isPtSysadmin,String tenantId);
 
 
-  UserDTO saveTenantAdmin(UserDTO userDTO,boolean isSysadmin,String tenantId);
+  UserDTO saveTenantAdmin(UserDTO userDTO,boolean isPtSysadmin,String tenantId);
 
 
-  void resetPassword(String userId,boolean isSysadmin,String tenantId);
+  void resetPassword(String userId,boolean isPtSysadmin,String tenantId);
 
 
   List<UserDetailsDTO> getUserByPhoneNumber(String phoneNumber);
   List<UserDetailsDTO> getUserByPhoneNumber(String phoneNumber);
 
 

+<?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="org.thingsboard.server.dao.yunteng.mapper.SysEnterpriseMapper">
+    <resultMap id="entity" type="org.thingsboard.server.common.data.yunteng.dto.SysEnterpriseDTO">
+        <result property="name" column="name"/>
+        <result property="abbreviation" column="abbreviation"/>
+        <result property="officialWebsite" column="official_website"/>
+        <result property="email" column="email"/>
+        <result property="synopsis" column="synopsis"/>
+        <result property="address" column="address"/>
+        <result property="contacts" column="contacts"/>
+        <result property="area" column="area"/>
+        <result property="tel" column="tel"/>
+        <result property="codeTown" column="code_town"/>
+        <result property="nameProv" column="name_prov"/>
+        <result property="codeProv" column="code_prov"/>
+        <result property="nameCity" column="name_city"/>
+        <result property="codeCity" column="code_city"/>
+        <result property="nameCoun" column="name_coun"/>
+        <result property="codeCoun" column="code_coun"/>
+        <result property="nameTown" column="name_town"/>
+    </resultMap>
+
+    <select id="get" resultMap="entity">
+        select se.name as          name,
+               se.abbreviation     abbreviation,
+               se.official_website official_website,
+               se.email            email,
+               se.synopsis         synopsis,
+               se.address          address,
+               se.contacts         contacts,
+               se.area             area,
+               se.tel              tel,
+               se.code_town        code_town,
+               st.name_prov        name_prov,
+               st.code_prov        code_prov,
+               st.name_city        name_city,
+               st.code_city        code_city,
+               st.name_coun        name_coun,
+               st.code_coun        code_coun,
+               st.name_town        name_town
+        from sys_enterprise se
+                 left join sys_town st on st.code_town = se.code_town
+        where se.tenant_code = #{tenantCode}
+    </select>
+
+</mapper>

+<?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="org.thingsboard.server.dao.yunteng.mapper.SysNoticeMapper">
+    <resultMap type="org.thingsboard.server.common.data.yunteng.dto.SysNoticeDTO" id="sysNotice">
+        <result property="id" column="id"/>
+        <result property="type" column="type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
+        <result property="title" column="title"/>
+        <result property="content" column="content"/>
+        <result property="receiverType" column="receiver_type"/>
+        <result property="receiverTypeIds" column="receiver_type_ids"/>
+        <result property="status" column="status"/>
+        <result property="senderName" column="sender_name"/>
+        <result property="senderDate" column="sender_date"/>
+        <result property="creator" column="creator"/>
+        <result property="updater" column="updater"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="tenantCode" column="tenant_code"/>
+    </resultMap>
+
+    <sql id="dict">
+        SELECT sdi.item_text
+        FROM sys_dict_item sdi
+                 LEFT JOIN sys_dict sd ON sd.id = sdi.dict_id
+        WHERE sdi.status = 1
+    </sql>
+
+    <sql id="columns">
+        SELECT
+        sn.id id,
+        sn.type AS type,
+        sn.title title,
+        sn.content AS content,
+        (
+        <include refid="dict"/>
+        AND sd.dict_code = 'receiver_type' AND sdi.item_value = sn.receiver_type
+        ) receiver_type,
+        sn.receiver_type_ids receiver_type_ids,
+        (
+        <include refid="dict"/>
+        AND sd.dict_code = 'draft_status' AND sdi.item_value = sn.status
+        ) status,
+        sn.sender_name sender_name,
+        sn.sender_date sender_date,
+        sn.creator creator,
+        sn.updater updater,
+        sn.create_time create_time,
+        sn.update_time update_time,
+        sn.tenant_code tenant_code
+        FROM sys_notice sn
+    </sql>
+    <select id="page" resultMap="sysNotice">
+        <include refid="columns"/>
+        WHERE
+        sn.tenant_code = #{queryMap.tenantCode}
+        <if test="queryMap.type != null">
+            sn.type = #{queryMap.type}
+        </if>
+    </select>
+    <select id="get" resultMap="sysNotice">
+        <include refid="columns"/>
+        WHERE
+        sn.tenant_code = #{tenantCode}
+        AND sn.id = #{id}
+    </select>
+</mapper>

+<?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="org.thingsboard.server.dao.yunteng.mapper.SysNoticeUserMapper">
+    <resultMap type="org.thingsboard.server.common.data.yunteng.dto.SysNoticeUserDTO" id="sysNoticeUser">
+        <result property="receiverId" column="receiver_id"/>
+        <result property="noticeId" column="notice_id"/>
+        <result property="readStatus" column="read_status"/>
+        <result property="readDate" column="read_date"/>
+        <result property="creator" column="creator"/>
+        <result property="updater" column="updater"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="tenantCode" column="tenant_code"/>
+        <result property="id" column="id"/>
+        <association property="sysNotice" javaType="org.thingsboard.server.common.data.yunteng.dto.SysNoticeDTO">
+            <result property="type" column="type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
+            <result property="senderName" column="sender_name"/>
+            <result property="senderDate" column="sender_date"/>
+        </association>
+    </resultMap>
+
+    <sql id="dict">
+        SELECT sdi.item_text
+        FROM sys_dict_item sdi
+                 LEFT JOIN sys_dict sd ON sd.id = sdi.dict_id
+        WHERE sdi.status = 1
+    </sql>
+
+    <sql id="columns">
+        SELECT snu.receiver_id receiver_id,
+               snu.notice_id   notice_id,
+               snu.read_status read_status,
+               snu.read_date   read_date,
+               snu.creator     creator,
+               snu.updater     updater,
+               snu.create_time create_time,
+               snu.update_time update_time,
+               snu.tenant_code tenant_code,
+               snu.id          id,
+               sn.type AS      type,
+               sn.sender_name  sender_name,
+               sn.sender_date  sender_date
+        FROM sys_notice_user snu
+                 LEFT JOIN sys_notice sn ON sn.id = snu.notice_id
+    </sql>
+    <select id="page" resultMap="sysNoticeUser">
+        <include refid="columns"/>
+        WHERE
+        snu.tenant_code = #{queryMap.tenantCode}
+        <if test="queryMap.type != null">
+            AND sn.type = #{queryMap.type}
+        </if>
+        <if test="queryMap.creator != null">
+            AND sn.creator = #{queryMap.creator}
+        </if>
+    </select>
+    <select id="get" resultMap="sysNoticeUser">
+        <include refid="columns"/>
+        WHERE
+        snu.tenant_code = #{tenantCode}
+        AND snu.id = #{id}
+    </select>
+</mapper>