添加站点授权

base-manager/src/main/java/com/mortals/xhx/module/sms/model/SmsSetEntity.java

@@ -2,196 +2,586 @@ package com.mortals.xhx.module.sms.model;
 
 import java.util.List;
 import java.util.ArrayList;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.sms.model.vo.SmsSetVo;
-/**
-* 短信设置实体对象
-*
-* @author zxfei
-* @date 2022-01-12
-*/
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
 
+/**
+ * 短信设置实体对象
+ *
+ * @author zxfei
+ * @date 2022-01-12
+ */
+@Accessors(chain = true)
 public class SmsSetEntity extends SmsSetVo {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 站点id
-    */
+     * 站点id
+     */
     private Long siteId;
     /**
-    * 站点名称
-    */
+     * 站点名称
+     */
     private String siteName;
     /**
-    * 短信签名
-    */
+     * 短信签名
+     */
     private String sign;
     /**
-    * 剩余短信条数
-    */
+     * 剩余短信条数
+     */
     private Long lastnum;
     /**
-    * 用户名
-    */
+     * 用户名
+     */
     private String username;
     /**
-    * 短信开关 (1.开,0.关)
-    */
+     * 短信开关 (1.开,0.关)
+     */
     private Integer messageoff;
     /**
-    * 短信平台 (1.容联,2.阿里云,3.移动)
-    */
+     * 短信平台 (1.容联,2.阿里云,3.移动)
+     */
     private Integer smsplatform;
 
+    /**
+     * 开始 序号，主键，自增长
+     */
+    private Long idStart;
+
+    /**
+     * 结束 序号，主键，自增长
+     */
+    private Long idEnd;
+
+    /**
+     * 增加 序号，主键，自增长
+     */
+    private Long idIncrement;
+
+    /**
+     * 序号，主键，自增长列表
+     */
+    private List<Long> idList;
+
+    /**
+     * 开始 站点id
+     */
+    private Long siteIdStart;
+
+    /**
+     * 结束 站点id
+     */
+    private Long siteIdEnd;
+
+    /**
+     * 增加 站点id
+     */
+    private Long siteIdIncrement;
+
+    /**
+     * 站点id列表
+     */
+    private List<Long> siteIdList;
+
+    /**
+     * 站点名称
+     */
+    private List<String> siteNameList;
+
+    /**
+     * 短信签名
+     */
+    private List<String> signList;
+
+    /**
+     * 开始 剩余短信条数
+     */
+    private Long lastnumStart;
+
+    /**
+     * 结束 剩余短信条数
+     */
+    private Long lastnumEnd;
+
+    /**
+     * 增加 剩余短信条数
+     */
+    private Long lastnumIncrement;
+
+    /**
+     * 剩余短信条数列表
+     */
+    private List<Long> lastnumList;
+
+    /**
+     * 用户名
+     */
+    private List<String> usernameList;
+
+    /**
+     * 开始 短信开关 (1.开,0.关)
+     */
+    private Integer messageoffStart;
+
+    /**
+     * 结束 短信开关 (1.开,0.关)
+     */
+    private Integer messageoffEnd;
 
+    /**
+     * 增加 短信开关 (1.开,0.关)
+     */
+    private Integer messageoffIncrement;
 
-    public SmsSetEntity(){}
     /**
-    * 获取 站点id
-    * @return Long
-    */
-    public Long getSiteId(){
+     * 短信开关 (1.开,0.关)列表
+     */
+    private List<Integer> messageoffList;
+
+    /**
+     * 开始 短信平台 (1.容联,2.阿里云,3.移动)
+     */
+    private Integer smsplatformStart;
+
+    /**
+     * 结束 短信平台 (1.容联,2.阿里云,3.移动)
+     */
+    private Integer smsplatformEnd;
+
+    /**
+     * 增加 短信平台 (1.容联,2.阿里云,3.移动)
+     */
+    private Integer smsplatformIncrement;
+
+    /**
+     * 短信平台 (1.容联,2.阿里云,3.移动)列表
+     */
+    private List<Integer> smsplatformList;
+
+    /**
+     * 开始 创建时间
+     */
+    private String createTimeStart;
+
+    /**
+     * 结束 创建时间
+     */
+    private String createTimeEnd;
+
+    /**
+     * 开始 创建用户
+     */
+    private Long createUserIdStart;
+
+    /**
+     * 结束 创建用户
+     */
+    private Long createUserIdEnd;
+
+    /**
+     * 增加 创建用户
+     */
+    private Long createUserIdIncrement;
+
+    /**
+     * 创建用户列表
+     */
+    private List<Long> createUserIdList;
+
+    /**
+     * 开始 修改时间
+     */
+    private String updateTimeStart;
+
+    /**
+     * 结束 修改时间
+     */
+    private String updateTimeEnd;
+
+    /**
+     * OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+     */
+    private List<SmsSetEntity> orConditionList;
+
+    /**
+     * AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+     */
+    private List<SmsSetEntity> andConditionList;
+
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public Long getSiteId() {
         return siteId;
     }
-    /**
-    * 设置 站点id
-    * @param siteId
-    */
-    public void setSiteId(Long siteId){
+
+    public void setSiteId(Long siteId) {
         this.siteId = siteId;
     }
-    /**
-    * 获取 站点名称
-    * @return String
-    */
-    public String getSiteName(){
+
+    public String getSiteName() {
         return siteName;
     }
-    /**
-    * 设置 站点名称
-    * @param siteName
-    */
-    public void setSiteName(String siteName){
+
+    public void setSiteName(String siteName) {
         this.siteName = siteName;
     }
-    /**
-    * 获取 短信签名
-    * @return String
-    */
-    public String getSign(){
+
+    public String getSign() {
         return sign;
     }
-    /**
-    * 设置 短信签名
-    * @param sign
-    */
-    public void setSign(String sign){
+
+    public void setSign(String sign) {
         this.sign = sign;
     }
-    /**
-    * 获取 剩余短信条数
-    * @return Long
-    */
-    public Long getLastnum(){
+
+    public Long getLastnum() {
         return lastnum;
     }
-    /**
-    * 设置 剩余短信条数
-    * @param lastnum
-    */
-    public void setLastnum(Long lastnum){
+
+    public void setLastnum(Long lastnum) {
         this.lastnum = lastnum;
     }
-    /**
-    * 获取 用户名
-    * @return String
-    */
-    public String getUsername(){
+
+    public String getUsername() {
         return username;
     }
-    /**
-    * 设置 用户名
-    * @param username
-    */
-    public void setUsername(String username){
+
+    public void setUsername(String username) {
         this.username = username;
     }
-    /**
-    * 获取 短信开关 (1.开,0.关)
-    * @return Integer
-    */
-    public Integer getMessageoff(){
+
+    public Integer getMessageoff() {
         return messageoff;
     }
-    /**
-    * 设置 短信开关 (1.开,0.关)
-    * @param messageoff
-    */
-    public void setMessageoff(Integer messageoff){
+
+    public void setMessageoff(Integer messageoff) {
         this.messageoff = messageoff;
     }
-    /**
-    * 获取 短信平台 (1.容联,2.阿里云,3.移动)
-    * @return Integer
-    */
-    public Integer getSmsplatform(){
+
+    public Integer getSmsplatform() {
         return smsplatform;
     }
-    /**
-    * 设置 短信平台 (1.容联,2.阿里云,3.移动)
-    * @param smsplatform
-    */
-    public void setSmsplatform(Integer smsplatform){
+
+    public void setSmsplatform(Integer smsplatform) {
         this.smsplatform = smsplatform;
     }
 
+    public Long getIdStart() {
+        return idStart;
+    }
+
+    public void setIdStart(Long idStart) {
+        this.idStart = idStart;
+    }
+
+    public Long getIdEnd() {
+        return idEnd;
+    }
+
+    public void setIdEnd(Long idEnd) {
+        this.idEnd = idEnd;
+    }
+
+    public Long getIdIncrement() {
+        return idIncrement;
+    }
+
+    public void setIdIncrement(Long idIncrement) {
+        this.idIncrement = idIncrement;
+    }
+
+    public List<Long> getIdList() {
+        return idList;
+    }
 
+    public void setIdList(List<Long> idList) {
+        this.idList = idList;
+    }
+
+    public Long getSiteIdStart() {
+        return siteIdStart;
+    }
 
+    public void setSiteIdStart(Long siteIdStart) {
+        this.siteIdStart = siteIdStart;
+    }
+
+    public Long getSiteIdEnd() {
+        return siteIdEnd;
+    }
+
+    public void setSiteIdEnd(Long siteIdEnd) {
+        this.siteIdEnd = siteIdEnd;
+    }
+
+    public Long getSiteIdIncrement() {
+        return siteIdIncrement;
+    }
+
+    public void setSiteIdIncrement(Long siteIdIncrement) {
+        this.siteIdIncrement = siteIdIncrement;
+    }
+
+    public List<Long> getSiteIdList() {
+        return siteIdList;
+    }
+
+    public void setSiteIdList(List<Long> siteIdList) {
+        this.siteIdList = siteIdList;
+    }
+
+    public List<String> getSiteNameList() {
+        return siteNameList;
+    }
+
+    public void setSiteNameList(List<String> siteNameList) {
+        this.siteNameList = siteNameList;
+    }
+
+    public List<String> getSignList() {
+        return signList;
+    }
+
+    public void setSignList(List<String> signList) {
+        this.signList = signList;
+    }
+
+    public Long getLastnumStart() {
+        return lastnumStart;
+    }
+
+    public void setLastnumStart(Long lastnumStart) {
+        this.lastnumStart = lastnumStart;
+    }
+
+    public Long getLastnumEnd() {
+        return lastnumEnd;
+    }
+
+    public void setLastnumEnd(Long lastnumEnd) {
+        this.lastnumEnd = lastnumEnd;
+    }
+
+    public Long getLastnumIncrement() {
+        return lastnumIncrement;
+    }
+
+    public void setLastnumIncrement(Long lastnumIncrement) {
+        this.lastnumIncrement = lastnumIncrement;
+    }
+
+    public List<Long> getLastnumList() {
+        return lastnumList;
+    }
+
+    public void setLastnumList(List<Long> lastnumList) {
+        this.lastnumList = lastnumList;
+    }
+
+    public List<String> getUsernameList() {
+        return usernameList;
+    }
+
+    public void setUsernameList(List<String> usernameList) {
+        this.usernameList = usernameList;
+    }
+
+    public Integer getMessageoffStart() {
+        return messageoffStart;
+    }
+
+    public void setMessageoffStart(Integer messageoffStart) {
+        this.messageoffStart = messageoffStart;
+    }
+
+    public Integer getMessageoffEnd() {
+        return messageoffEnd;
+    }
+
+    public void setMessageoffEnd(Integer messageoffEnd) {
+        this.messageoffEnd = messageoffEnd;
+    }
+
+    public Integer getMessageoffIncrement() {
+        return messageoffIncrement;
+    }
+
+    public void setMessageoffIncrement(Integer messageoffIncrement) {
+        this.messageoffIncrement = messageoffIncrement;
+    }
+
+    public List<Integer> getMessageoffList() {
+        return messageoffList;
+    }
+
+    public void setMessageoffList(List<Integer> messageoffList) {
+        this.messageoffList = messageoffList;
+    }
+
+    public Integer getSmsplatformStart() {
+        return smsplatformStart;
+    }
+
+    public void setSmsplatformStart(Integer smsplatformStart) {
+        this.smsplatformStart = smsplatformStart;
+    }
+
+    public Integer getSmsplatformEnd() {
+        return smsplatformEnd;
+    }
+
+    public void setSmsplatformEnd(Integer smsplatformEnd) {
+        this.smsplatformEnd = smsplatformEnd;
+    }
+
+    public Integer getSmsplatformIncrement() {
+        return smsplatformIncrement;
+    }
+
+    public void setSmsplatformIncrement(Integer smsplatformIncrement) {
+        this.smsplatformIncrement = smsplatformIncrement;
+    }
+
+    public List<Integer> getSmsplatformList() {
+        return smsplatformList;
+    }
+
+    public void setSmsplatformList(List<Integer> smsplatformList) {
+        this.smsplatformList = smsplatformList;
+    }
+
+    public String getCreateTimeStart() {
+        return createTimeStart;
+    }
+
+    public void setCreateTimeStart(String createTimeStart) {
+        this.createTimeStart = createTimeStart;
+    }
+
+    public String getCreateTimeEnd() {
+        return createTimeEnd;
+    }
+
+    public void setCreateTimeEnd(String createTimeEnd) {
+        this.createTimeEnd = createTimeEnd;
+    }
+
+    public Long getCreateUserIdStart() {
+        return createUserIdStart;
+    }
+
+    public void setCreateUserIdStart(Long createUserIdStart) {
+        this.createUserIdStart = createUserIdStart;
+    }
+
+    public Long getCreateUserIdEnd() {
+        return createUserIdEnd;
+    }
+
+    public void setCreateUserIdEnd(Long createUserIdEnd) {
+        this.createUserIdEnd = createUserIdEnd;
+    }
+
+    public Long getCreateUserIdIncrement() {
+        return createUserIdIncrement;
+    }
+
+    public void setCreateUserIdIncrement(Long createUserIdIncrement) {
+        this.createUserIdIncrement = createUserIdIncrement;
+    }
+
+    public List<Long> getCreateUserIdList() {
+        return createUserIdList;
+    }
+
+    public void setCreateUserIdList(List<Long> createUserIdList) {
+        this.createUserIdList = createUserIdList;
+    }
+
+    public String getUpdateTimeStart() {
+        return updateTimeStart;
+    }
+
+    public void setUpdateTimeStart(String updateTimeStart) {
+        this.updateTimeStart = updateTimeStart;
+    }
+
+    public String getUpdateTimeEnd() {
+        return updateTimeEnd;
+    }
+
+    public void setUpdateTimeEnd(String updateTimeEnd) {
+        this.updateTimeEnd = updateTimeEnd;
+    }
+
+    public List<SmsSetEntity> getOrConditionList() {
+        return orConditionList;
+    }
+
+    public void setOrConditionList(List<SmsSetEntity> orConditionList) {
+        this.orConditionList = orConditionList;
+    }
+
+    public List<SmsSetEntity> getAndConditionList() {
+        return andConditionList;
+    }
+
+    public SmsSetEntity setAndConditionList(List<SmsSetEntity> andConditionList) {
+        this.andConditionList = andConditionList;
+        return this;
+    }
 
     @Override
     public int hashCode() {
-         return this.getId().hashCode();
+        return this.getId().hashCode();
     }
+
     @Override
     public boolean equals(Object obj) {
         if (obj == null) return false;
         if (obj instanceof SmsSetEntity) {
             SmsSetEntity tmp = (SmsSetEntity) obj;
             if (this.getId() == tmp.getId()) {
-                 return true;
+                return true;
             }
         }
         return false;
     }
 
-    public String toString(){
-        StringBuilder sb = new StringBuilder("");
-        sb.append(",siteId:").append(getSiteId());
-        sb.append(",siteName:").append(getSiteName());
-        sb.append(",sign:").append(getSign());
-        sb.append(",lastnum:").append(getLastnum());
-        sb.append(",username:").append(getUsername());
-        sb.append(",messageoff:").append(getMessageoff());
-        sb.append(",smsplatform:").append(getSmsplatform());
-        return sb.toString();
-    }
 
-    public void initAttrValue(){
+    public void initAttrValue() {
 
-            this.siteId = null;
+        this.siteId = null;
 
-            this.siteName = null;
+        this.siteName = null;
 
-            this.sign = null;
+        this.sign = null;
 
-            this.lastnum = null;
+        this.lastnum = null;
 
-            this.username = null;
+        this.username = null;
+
+        this.messageoff = 1;
+
+        this.smsplatform = 1;
+    }
 
-            this.messageoff = 1;
+    public static void main(String[] args) {
+        SmsSetEntity smsSetEntity = new SmsSetEntity();
+        //smsSetEntity
+        //smsSetEntity.
+        //smsSetEntity.setUsername("").;
 
-            this.smsplatform = 1;
     }
 }
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/base/system/upload/web/UploadController.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.web.BaseController;
 import com.mortals.xhx.base.system.upload.service.UploadService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -22,6 +23,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("file")
+@Slf4j
 public class UploadController extends BaseController {
 
     @Resource
@@ -37,7 +39,6 @@ public class UploadController extends BaseController {
             model.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
             jsonStr = JSONObject.toJSONString(model);
         } catch (AppException e) {
-            log.debug(e);
             model.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
             model.put(KEY_RESULT_MSG, e.getMessage());
             jsonStr = JSONObject.toJSONString(model);
@@ -62,7 +63,7 @@ public class UploadController extends BaseController {
             model.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
             jsonStr = JSONObject.toJSONString(model);
         } catch (AppException e) {
-            log.debug(e);
+            log.error("上传异常",e);
             model.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
             model.put(KEY_RESULT_MSG, e.getMessage());
             jsonStr = JSONObject.toJSONString(model);
@@ -72,6 +73,7 @@ public class UploadController extends BaseController {
             model.put(KEY_RESULT_MSG, "文件上传失败");
             jsonStr = JSONObject.toJSONString(model);
         }
+        log.info("uploadResp==>{}",jsonStr);
         return jsonStr;
     }