ソースを参照

Merge branch 'test' of https://gitee.com/hcst/adsp-boot into test

# Conflicts:
#	jeecg-boot-module-system/src/main/resources/application-dev.yml
syh 5 年 前
コミット
f407fa4a9f

+ 17 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectController.java

@@ -10,9 +10,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.ctop.entity.Advertiser;
 import org.jeecg.modules.ctop.entity.Project;
@@ -89,13 +91,15 @@ public class ProjectController {
         String roleCode = materialReportMapper.getRoleCodeByUserId(userId);
         QueryWrapper<Project> queryWrapper = new QueryWrapper<>();
         if (!"admin".equals(roleCode)) {
-            queryWrapper.eq("user_id", userId);
+            queryWrapper.eq("responsible_id", userId);
             queryWrapper.orderByDesc("create_time");
         }
         List<Project> projects = projectMapper.selectList(queryWrapper);
         map.put("success", true);
         map.put("code", 0);
         map.put("result", projects);
+
+
         return map;
     }
 
@@ -119,6 +123,18 @@ public class ProjectController {
         Result<IPage<Project>> result = new Result<IPage<Project>>();
         QueryWrapper<Project> queryWrapper = QueryGenerator.initQueryWrapper(project, req.getParameterMap());
         Page<Project> page = new Page<Project>(pageNo, pageSize);
+
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        if (Check.isNull(sysUser)) {
+            result.setSuccess(false);
+            return result;
+        }
+
+        String roleCode = materialReportMapper.getRoleCodeByUserId(sysUser.getId());
+        if (!"admin".equals(roleCode)) {
+            queryWrapper.eq("user_id", sysUser.getId());
+            queryWrapper.orderByDesc("create_time");
+        }
         IPage<Project> pageList = projectService.page(page, queryWrapper);
         result.setSuccess(true);
         result.setResult(pageList);

+ 2 - 5
jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -100,12 +100,9 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          #          url: jdbc:mysql://39.106.184.70:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
-          #          username: hcst
-          #          password: hcst2019
-          url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          url: jdbc:mysql://39.106.184.70:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
           username: root
-          password: root
+          password: hcst2019
           driver-class-name: com.mysql.jdbc.Driver
           # 多数据源配置
           #multi-datasource1:

+ 1 - 1
jeecg-boot-module-system/src/main/resources/application-test.yml

@@ -100,7 +100,7 @@ spring:
       datasource:
         master:
           url: jdbc:mysql://39.106.184.70:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
-          username: hcst
+          username: root
           password: hcst2019
           driver-class-name: com.mysql.jdbc.Driver
           # 多数据源配置

+ 3 - 6
module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java

@@ -89,7 +89,8 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
     public Map<String, Object> insert(JSONObject jsonObject) {
         Map<String, Object> resultMap = new HashMap<>();
         try {
-            Boolean isVideo = imgLocation(jsonObject.getString("url"));
+            // Boolean isVideo = imgLocation(jsonObject.getString("url"));
+            String type = jsonObject.getString("type");
             MaterialInfo info = new MaterialInfo();
             info.setId(jsonObject.getString("code"));
             info.setCode(jsonObject.getString("code"));
@@ -109,11 +110,7 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
             info.setMaterialDescribe(jsonObject.getString("materialDescribe"));
             info.setCreateTime(new Date());
             info.setUpdateTime(new Date());
-            if (isVideo) {
-                info.setType("VIDEO");
-            } else {
-                info.setType("IMAGE");
-            }
+            info.setType(type);
             this.save(info);
             Map<String, Object> deleteMap = new HashMap<>();
             deleteMap.put("material_id", info.getId());