Browse Source

1.用户组管理

heqinwei 7 years ago
parent
commit
6282c33bc2

+ 29 - 1
src/main/java/com/controller/DataConnectorController.java

@@ -3,6 +3,7 @@ package com.controller;
 import com.model.bo.GroupUpdateId;
 import com.model.bo.ToSql;
 import com.model.pojo.RepEntity;
+import com.model.vo.configVo.BdStrategysInfo;
 import com.model.vo.configVo.DataConnectorInfo;
 import com.model.vo.configVo.GroupInfo;
 import com.server.DataConnectorService;
@@ -139,5 +140,32 @@ public class DataConnectorController {
     /*
     添加数据源策略
      */
-//    @RequestMapping("/")
+    @RequestMapping("/addDbStrategys")
+    public RepEntity addDbStrategys(@RequestBody BdStrategysInfo body){
+        return dataConnectorService.addDbStrategys(body);
+    }
+
+    /*
+    删除数据源策略
+     */
+    @RequestMapping("/delDbStrategys")
+    public RepEntity delDbStrategys(@RequestBody List<Integer> body){
+        return dataConnectorService.delDbStrategys(body);
+    }
+
+    /*
+    更新数据源策略
+     */
+    @RequestMapping("/updateDbStrategys")
+    public RepEntity updateDbStrategys(@RequestBody BdStrategysInfo body){
+        return dataConnectorService.updateDbStrategys(body);
+    }
+
+    /*
+    查询数据源策略
+     */
+    @RequestMapping("/getDbStrategys")
+    public RepEntity getDbStrategys(){
+        return dataConnectorService.getDbStrategys();
+    }
 }

+ 50 - 0
src/main/java/com/dao/DataConnectorMapper.java

@@ -1,5 +1,6 @@
 package com.dao;
 
+import com.model.po.BdStrategys;
 import com.model.po.DataConnector;
 import com.model.po.DataConnectorList;
 import com.model.po.Databases;
@@ -217,4 +218,53 @@ public interface DataConnectorMapper {
      */
     @Select("select chart_name from bi_charts where bd_data_ID = #{id}")
     List<String> getChartsName(int id);
+
+     /*
+    保存数据源策略
+     */
+     @Insert("insert into bi_db_strategys(bs_id, bs_db_id, bs_rule, bs_name, createBy, create_date) values" +
+             "(#{id}, #{databaseId}, #{rule}, #{name}, #{createBy}, " +
+             "to_date(to_char(sysdate,'yyyy-mm-dd hh24:mi:ss'),'YYYY-MM-DD hh24:mi:ss'))")
+     @SelectKey(before=true,keyProperty="id",resultType=int.class,statement="SELECT bi_db_strategys_squence.nextval from dual",keyColumn = "bs_id")
+    void addStrategys(BdStrategys bdStrategys);
+
+     /*
+     更新数据源策略
+      */
+    @Update("<script>"+
+            "UPDATE bi_db_strategys set "+
+            "BS_DB_ID = #{datebaseId}" +
+            "<if test=\"rule != null\"> , BS_RULE = #{rule} </if>" +
+            "<if test=\"name != null\"> , BS_NAME = #{name} </if>" +
+            "<if test=\"createBy != null\"> , create_by = #{createBy} </if>" +
+            "<if test=\"isOpen != null\"> , IS_OPEN = #{isOpen} </if>" +
+            ",updata_date = to_date(to_char(sysdate,'yyyy-mm-dd hh24:mi:ss'),'YYYY-MM-DD hh24:mi:ss') "+
+            " where bs_id = #{id}" +
+            "</script>")
+    void updataDbStrategys(BdStrategys bdStrategys);
+
+     /*
+     删除数据源策略
+      */
+     @Delete("<script>" +
+             "delete from bi_db_strategys where bs_id in" +
+             "(" +
+             "<foreach collection=\"list\" index=\"index\" item=\"item\"  separator=\",\">" +
+             "#{item, jdbcType = NUMERIC}" +
+             " </foreach>" +
+             ")" +
+             "</script>")
+    void delDbStrategys(List<Integer> idList);
+
+     /*
+     查询数据源Id
+      */
+//     @Select("")
+
+     /*
+    查询数据源策略
+     */
+     @Select(" select bs_id as id, bs_db_id as databaseId, bs_name as name, is_open as isOpen, bs_rule as rule, create_date as createDate,  " +
+             " updata_date as updataDate from bi_db_strategys where bs_id = #{id}")
+    List<BdStrategys> getDbStrategys();
 }

+ 1 - 1
src/main/java/com/dao/UserMapper.java

@@ -58,7 +58,7 @@ public interface UserMapper {
     查询用户组
      */
     @Select("select bg_id as id, bg_name as userGroupName, bg_note as userGroupNote, create_date as createDate, " +
-            "update_date as updateDate from bi_user_groups ")
+            "updata_date as updateDate from bi_user_groups ")
     List<UserGroup> getUserGroup();
 
     /*

+ 78 - 0
src/main/java/com/model/po/BdStrategys.java

@@ -0,0 +1,78 @@
+package com.model.po;
+
+import java.util.Date;
+
+public class BdStrategys {
+    private int id;
+    private int databaseId;
+    private String name;
+    private String rule;
+    private String isOpen;
+    private String createBy;
+    private Date createDate;
+    private Date updataDate;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public int getDatabaseId() {
+        return databaseId;
+    }
+
+    public void setDatabaseId(int databaseId) {
+        this.databaseId = databaseId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getRule() {
+        return rule;
+    }
+
+    public void setRule(String rule) {
+        this.rule = rule;
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Date getUpdataDate() {
+        return updataDate;
+    }
+
+    public void setUpdataDate(Date updataDate) {
+        this.updataDate = updataDate;
+    }
+
+    public String getIsOpen() {
+        return isOpen;
+    }
+
+    public void setIsOpen(String isOpen) {
+        this.isOpen = isOpen;
+    }
+}

+ 33 - 0
src/main/java/com/model/po/BdStrategysData.java

@@ -0,0 +1,33 @@
+package com.model.po;
+
+import java.util.List;
+
+public class BdStrategysData {
+    private List<BdStrategys> bdStrategys;
+    private List<String> userGroupName;
+    private List<String> userName;
+
+    public List<BdStrategys> getBdStrategys() {
+        return bdStrategys;
+    }
+
+    public void setBdStrategys(List<BdStrategys> bdStrategys) {
+        this.bdStrategys = bdStrategys;
+    }
+
+    public List<String> getUserGroupName() {
+        return userGroupName;
+    }
+
+    public void setUserGroupName(List<String> userGroupName) {
+        this.userGroupName = userGroupName;
+    }
+
+    public List<String> getUserName() {
+        return userName;
+    }
+
+    public void setUserName(List<String> userName) {
+        this.userName = userName;
+    }
+}

+ 62 - 0
src/main/java/com/model/vo/configVo/BdStrategysInfo.java

@@ -0,0 +1,62 @@
+package com.model.vo.configVo;
+
+import com.model.bo.Screen;
+
+import java.util.List;
+
+public class BdStrategysInfo {
+    private int id;
+    private int databaseId;
+    private String name;
+    private List<Screen> rule;
+    private String isOpen;
+    private String createBy;
+
+    public String getIsOpen() {
+        return isOpen;
+    }
+
+    public void setIsOpen(String isOpen) {
+        this.isOpen = isOpen;
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public int getDatabaseId() {
+        return databaseId;
+    }
+
+    public void setDatabaseId(int databaseId) {
+        this.databaseId = databaseId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public List<Screen> getRule() {
+        return rule;
+    }
+
+    public void setRule(List<Screen> rule) {
+        this.rule = rule;
+    }
+}

+ 46 - 0
src/main/java/com/server/DataConnectorService.java

@@ -6,13 +6,16 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.model.bo.DatabaseConfig;
 import com.model.bo.GroupUpdateId;
 import com.model.po.BaseConfig;
+import com.model.po.BdStrategys;
 import com.model.po.DataConnector;
 import com.model.po.DataConnectorList;
 import com.model.pojo.RepCode;
 import com.model.pojo.RepEntity;
+import com.model.vo.configVo.BdStrategysInfo;
 import com.model.vo.configVo.ColumnRenameInfo;
 import com.model.vo.configVo.DataConnectorInfo;
 import com.model.vo.configVo.GroupInfo;
+import com.util.ScreenUtil;
 import com.util.SqlMatch;
 import com.util.TimeUtil;
 import org.springframework.beans.BeanUtils;
@@ -38,6 +41,9 @@ public class DataConnectorService {
     @Autowired
     ObjectMapper objectmapper;
 
+    @Autowired
+    ScreenUtil screenUtil;
+
     /*
     保存数据源
      */
@@ -304,4 +310,44 @@ public class DataConnectorService {
     public RepEntity getConnectorGroup(){
         return new RepEntity(RepCode.success, dataConnectorMapper.getConnectorGroup());
     }
+
+    /*
+    保存数据源策略
+     */
+    public RepEntity addDbStrategys(BdStrategysInfo bdStrategysInfo){
+        BdStrategys bdStrategys = new BdStrategys();
+        BeanUtils.copyProperties(bdStrategysInfo, bdStrategys);
+        String scr = screenUtil.screensUtil(bdStrategysInfo.getRule(), "", "").getRet();
+        bdStrategys.setRule(scr);
+        dataConnectorMapper.addStrategys(bdStrategys);
+        return new RepEntity(RepCode.success, bdStrategys.getId());
+    }
+
+    /*
+    更新数据源策略
+     */
+    public RepEntity updateDbStrategys(BdStrategysInfo bdStrategysInfo){
+        BdStrategys bdStrategys = new BdStrategys();
+        BeanUtils.copyProperties(bdStrategysInfo, bdStrategys);
+        String scr = screenUtil.screensUtil(bdStrategysInfo.getRule(), "", "").getRet();
+        bdStrategys.setRule(scr);
+        dataConnectorMapper.addStrategys(bdStrategys);
+        return new RepEntity(RepCode.success);
+    }
+
+    /*
+    删除数据源策略
+     */
+    public RepEntity delDbStrategys(List<Integer> idList){
+        dataConnectorMapper.delDbStrategys(idList);
+        return new RepEntity(RepCode.success);
+    }
+
+    /*
+    查询数据源策略列表
+     */
+    public RepEntity getDbStrategys(){
+        List<BdStrategys> bdStrategys =  dataConnectorMapper.getDbStrategys();
+        return new RepEntity(RepCode.success);
+    }
 }