diff --git a/ds-base/src/main/java/com/dsideal/base/DataAuthority/Controller/DataAuthorityController.java b/ds-base/src/main/java/com/dsideal/base/DataAuthority/Controller/DataAuthorityController.java index 4ca620d8..71216a65 100644 --- a/ds-base/src/main/java/com/dsideal/base/DataAuthority/Controller/DataAuthorityController.java +++ b/ds-base/src/main/java/com/dsideal/base/DataAuthority/Controller/DataAuthorityController.java @@ -67,18 +67,33 @@ public class DataAuthorityController extends Controller { } /** - * 功能：保存人员+角色+数据权限 + * 功能：增加人员+角色+数据权限 * * @param person_id 人员 * @param duties_id 角色ID * @param resource_type_code 资源类型编码 - * @param resource_ids 数据权限，以逗号分隔 - * @param resource_names 数据权限名称，以逗号分隔 + * @param resource_ids 数据权限 */ @IsLoginInterface({}) - @EmptyInterface({"person_id", "resource_type_code", "duties_id", "resource_ids", "resource_names"}) - public void savePersonDutyResources(String person_id, String resource_type_code, int duties_id, String resource_ids, String resource_names) { - dm.savePersonDutyResources(person_id, resource_type_code, duties_id, resource_ids, resource_names); + @EmptyInterface({"person_id", "resource_type_code", "duties_id", "resource_ids"}) + public void addPersonDutyResource(String person_id, String resource_type_code, int duties_id, String resource_ids) { + dm.addPersonDutyResource(person_id, resource_type_code, duties_id, resource_ids); + Kv kv = Kv.by("success", true); + kv.set("message", "保存成功!"); + renderJson(kv); + } + /** + * 功能：删除人员+角色+数据权限 + * + * @param person_id 人员 + * @param duties_id 角色ID + * @param resource_type_code 资源类型编码 + * @param resource_ids 数据权限 + */ + @IsLoginInterface({}) + @EmptyInterface({"person_id", "resource_type_code", "duties_id", "resource_ids"}) + public void delPersonDutyResource(String person_id, String resource_type_code, int duties_id, String resource_ids) { + dm.delPersonDutyResource(person_id, resource_type_code, duties_id, resource_ids); Kv kv = Kv.by("success", true); kv.set("message", "保存成功!"); renderJson(kv); diff --git a/ds-base/src/main/java/com/dsideal/base/DataAuthority/Model/DataAuthorityModel.java b/ds-base/src/main/java/com/dsideal/base/DataAuthority/Model/DataAuthorityModel.java index 6ca2afcd..d7f34f26 100644 --- a/ds-base/src/main/java/com/dsideal/base/DataAuthority/Model/DataAuthorityModel.java +++ b/ds-base/src/main/java/com/dsideal/base/DataAuthority/Model/DataAuthorityModel.java @@ -78,24 +78,29 @@ public class DataAuthorityModel { * @param person_id 人员 * @param duties_id 角色 * @param resource_type_code 资源类型编码 - * @param resource_ids 数据权限，以逗号分隔 - * @param resource_names 数据权限名称，以逗号分隔 + * @param resource_ids 数据权限 */ - public void savePersonDutyResources(String person_id, String resource_type_code, int duties_id, String resource_ids, String resource_names) { - String[] idArray = resource_ids.split(","); - String[] nameArray = resource_names.split(","); - - String sql = "delete from t_person_duty_charge_resource where person_id=? and duties_id=?"; - Db.update(sql, person_id, duties_id); + public void addPersonDutyResource(String person_id, String resource_type_code, int duties_id, String resource_ids) { + for (String resource_id : resource_ids.split(",")) { + //先删除后插入 + delPersonDutyResource(person_id, resource_type_code, duties_id, resource_id); + //插入 + String sql = "insert into t_person_duty_charge_resource(duties_id,resource_type_code,resource_id,resource_name,person_id) values(?,?,?,?,?)"; + Db.update(sql, duties_id, resource_type_code, resource_id, getSysResource(Integer.parseInt(resource_id)).getStr("resource_name"), person_id); + } + } - sql = "insert into t_person_duty_charge_resource(duties_id,resource_type_code,resource_id,resource_name,person_id) values(?,?,?,?,?)"; - for (int i = 0; i < idArray.length; i++) { - String resource_id = idArray[i]; - String resource_name = nameArray[i]; - Db.update(sql, duties_id, resource_type_code, resource_id, resource_name, person_id); + public void delPersonDutyResource(String person_id, String resource_type_code, int duties_id, String resource_ids) { + for (String resource_id : resource_ids.split(",")) { + String sql = "delete from t_person_duty_charge_resource where person_id=? and duties_id=? and resource_type_code=? and resource_id=?"; + Db.update(sql, person_id, duties_id, resource_type_code, resource_id); } } + public Record getSysResource(int resource_id) { + return Db.findFirst("select * from t_sys_resource where resource_id=?", resource_id); + } + /** * 功能：获取人员角色数据权限 * diff --git a/ds-gw/src/main/java/com/dsideal/gw/Contoller/IndexController.java b/ds-gw/src/main/java/com/dsideal/gw/Contoller/IndexController.java index 1af00b2d..45d83201 100644 --- a/ds-gw/src/main/java/com/dsideal/gw/Contoller/IndexController.java +++ b/ds-gw/src/main/java/com/dsideal/gw/Contoller/IndexController.java @@ -5,6 +5,6 @@ import com.jfinal.core.Controller; public class IndexController extends Controller { public void index() { - renderText("Welcome to DsGw!"); + renderText("Welcome To The dsGw World (^_^)"); } } diff --git a/ds-gw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java b/ds-gw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java index 765bba28..5514f694 100644 --- a/ds-gw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java +++ b/ds-gw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java @@ -8,6 +8,7 @@ import okhttp3.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.IOException; import java.util.Enumeration; @@ -143,6 +144,25 @@ public class RouterHandler extends Handler { jo.put("message", "请求失败！" + e); renderJson(res, jo); } + } else //上传文件 + //TODO + if (req.getContentType().startsWith("multipart/form-data")) { + // 指定文件类型 + MediaType mediaType = MediaType.parse("multipart/form-data"); + // 创建RequestBody + File file = new File("/path/to/your/file.jpg"); + RequestBody requestBody = RequestBody.create(mediaType, file); + // 构建MultipartBody + MultipartBody body = new MultipartBody.Builder() + .setType(MultipartBody.FORM) + .addFormDataPart("file", file.getName(), requestBody) + .build(); + + // 构建Request + Request request = new Request.Builder() + .url("http://your.upload.url/post") + .post(body) + .build(); } else { // MinIO - 服务端签名直传（前端 + 后端 + 效果演示） //https://blog.csdn.net/CYK_byte/article/details/140254412 diff --git a/ds-gw/src/main/resources/log4j.properties b/ds-gw/src/main/resources/log4j.properties new file mode 100644 index 00000000..625cca1e --- /dev/null +++ b/ds-gw/src/main/resources/log4j.properties @@ -0,0 +1,12 @@ +log4j.rootLogger=WARN, console +log4j.appender.console=org.apache.log4j.ConsoleAppender +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.conversionPattern=%5p [%t] (%F:%L) - %m%n + +log4j.appender.mq=org.apache.rocketmq.logappender.log4j.RocketmqLog4jAppender +log4j.appender.mq.Topic=TOPIC_MEIWEI_SMS_NOTICE_TEST +log4j.appender.mq.Tag=PID_MEIWEI_SMS_RETRY_TIMEOUT +log4j.appender.mq.ProducerGroup=meiwei-producer-retry +log4j.appender.mq.NameServerAddress=127.0.0.1:9876;127.0.0.1:9877 +log4j.appender.mq.layout=org.apache.log4j.PatternLayout +log4j.appender.mq.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-4r [%t] (%F:%L) % \ No newline at end of file diff --git a/ds-gw/src/main/resources/logback.xml b/ds-gw/src/main/resources/logback.xml new file mode 100644 index 00000000..bd7c2a83 --- /dev/null +++ b/ds-gw/src/main/resources/logback.xml @@ -0,0 +1,39 @@ + + + + + + + + + %date{yyyy-MM-dd HH:mm:ss.SSS} %boldYellow([%thread]) %highlight(%-5level) %boldGreen(%logger{40}) + - %msg%n + + + + + + ${LOG_HOME}/QingLong.log + + + ${LOG_HOME}/ds-gw.log.%d{yyyy-MM-dd}.log + + 30 + + + + %date{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{40} - %msg%n + + + + 100MB + + + + + + + + + + \ No newline at end of file diff --git a/ds-gw/target/classes/log4j.properties b/ds-gw/target/classes/log4j.properties new file mode 100644 index 00000000..625cca1e --- /dev/null +++ b/ds-gw/target/classes/log4j.properties @@ -0,0 +1,12 @@ +log4j.rootLogger=WARN, console +log4j.appender.console=org.apache.log4j.ConsoleAppender +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.conversionPattern=%5p [%t] (%F:%L) - %m%n + +log4j.appender.mq=org.apache.rocketmq.logappender.log4j.RocketmqLog4jAppender +log4j.appender.mq.Topic=TOPIC_MEIWEI_SMS_NOTICE_TEST +log4j.appender.mq.Tag=PID_MEIWEI_SMS_RETRY_TIMEOUT +log4j.appender.mq.ProducerGroup=meiwei-producer-retry +log4j.appender.mq.NameServerAddress=127.0.0.1:9876;127.0.0.1:9877 +log4j.appender.mq.layout=org.apache.log4j.PatternLayout +log4j.appender.mq.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-4r [%t] (%F:%L) % \ No newline at end of file diff --git a/ds-gw/target/classes/logback.xml b/ds-gw/target/classes/logback.xml new file mode 100644 index 00000000..bd7c2a83 --- /dev/null +++ b/ds-gw/target/classes/logback.xml @@ -0,0 +1,39 @@ + + + + + + + + + %date{yyyy-MM-dd HH:mm:ss.SSS} %boldYellow([%thread]) %highlight(%-5level) %boldGreen(%logger{40}) + - %msg%n + + + + + + ${LOG_HOME}/QingLong.log + + + ${LOG_HOME}/ds-gw.log.%d{yyyy-MM-dd}.log + + 30 + + + + %date{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{40} - %msg%n + + + + 100MB + + + + + + + + + + \ No newline at end of file