工作流以及开发配置

eladmin-activity/src/main/java/me/zhengjie/modules/activiti/rest/ActivitiController.java

@@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.java.Log;
 import me.zhengjie.annotation.AnonymousAccess;
 import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.utils.PageUtil;
@@ -46,6 +47,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
+import java.util.Map;
 
 @Controller
 @RequiredArgsConstructor
@@ -70,7 +72,10 @@ public class ActivitiController implements ModelDataJsonConstants {
         }
         modelQuery.orderByLastUpdateTime().desc();
         List<Model> models = modelQuery.list();
-        return new ResponseEntity<>(PageUtil.toPage(PageUtil.toPage(page, size, models), models.size()), HttpStatus.OK);
+//        models.forEach(item=>{
+//
+//        });
+        return new ResponseEntity<>(PageUtil.toPage(models, models.size()), HttpStatus.OK);
     }
 
     @ApiOperation("创建基本模型,跳转设计页面")
@@ -115,12 +120,12 @@ public class ActivitiController implements ModelDataJsonConstants {
     }
 
     @ApiOperation("创建基本模型,返回一个modelID")
-    @GetMapping("/model/createModel")
+    @PostMapping("/model/createModel")
     @AnonymousAccess
-    public ResponseEntity<Object> createModelAPI(HttpServletRequest request, HttpServletResponse response) throws Exception {
-        String modelName = "modelName";
-        String modelKey = "modelKey";
-        String description = "description";
+    public ResponseEntity<Object> createModelAPI(@RequestBody Map<String,Object> map, HttpServletRequest request, HttpServletResponse response) throws Exception {
+        String modelName = map.get("name").toString();
+        String modelKey = map.get("key").toString();
+        String description = map.get("description").toString();
 
         ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
 
@@ -139,7 +144,7 @@ public class ActivitiController implements ModelDataJsonConstants {
         ObjectNode modelObjectNode = objectMapper.createObjectNode();
         modelObjectNode.put(ModelDataJsonConstants.MODEL_NAME, modelName);
         modelObjectNode.put(ModelDataJsonConstants.MODEL_REVISION, 1);
-        modelObjectNode.put(ModelDataJsonConstants.MODEL_DESCRIPTION, description);
+        modelObjectNode.put(ModelDataJsonConstants.MODEL_DESCRIPTION,description);
         modelData.setMetaInfo(modelObjectNode.toString());
         modelData.setName(modelName);
         modelData.setKey(modelKey);
@@ -285,5 +290,4 @@ public class ActivitiController implements ModelDataJsonConstants {
         return new ResponseEntity<>("部署成功", HttpStatus.OK);
     }
 
-
 }

eladmin-activity/src/main/resources/static/editor-app/app-cfg.js

@@ -23,4 +23,6 @@ var ACTIVITI = ACTIVITI || {};
 ACTIVITI.CONFIG = {
 	// 'contextRoot' : '/activiti-explorer/service',
 	'contextRoot' : '/api/activiti',
+	'url' : '/api/thirdparty/v1/user',
+
 };

eladmin-activity/src/main/resources/static/editor-app/app.js

@@ -109,6 +109,17 @@ activitiModeler
                     });
             }
 
+           function getSystemApi(){
+               var systemApi = KISBPM.URL.getSystemApi(20,0);
+               $http({method: 'GET', url: systemApi}).
+               success(function (data, status, headers, config) {
+                   console.log(data);
+               }).
+               error(function (data, status, headers, config) {
+                   console.log(data);
+               });
+            }
+
 
             function initScrollHandling() {
                 var canvasSection = jQuery('#canvasSection');
@@ -182,7 +193,7 @@ activitiModeler
 	
 	                var modelId = EDITOR.UTIL.getParameterByName('modelId');
 	                fetchModel(modelId);
-	
+                    getSystemApi();
 	                $rootScope.window = {};
 	                var updateWindowSize = function() {
 	                    $rootScope.window.width = $window.innerWidth;

eladmin-activity/src/main/resources/static/editor-app/configuration/url-config.js

@@ -30,5 +30,8 @@ KISBPM.URL = {
 
     putModel: function(modelId) {
         return ACTIVITI.CONFIG.contextRoot + '/model/' + modelId + '/save';
+    },
+    getSystemApi: function (systemId,status){
+        return  ACTIVITI.CONFIG.url+'/findByIdAndStatus?status='+status+'&systemId='+systemId;
     }
 };

eladmin-activity/src/main/resources/static/editor-app/editor.html

@@ -111,6 +111,7 @@
 		                        </a>
 		                    </div>
 		                </div>
+						<!-- 配置 -->
                     	<div class="selected-item-body">
 	                        <div>
 	                             <div class="property-row" ng-repeat="property in selectedItem.properties"

eladmin-activity/src/main/resources/static/editor-app/popups/save-model.html

@@ -38,4 +38,5 @@
         
         </div>
     </div>
+</div>
 </div>

eladmin-system/src/main/java/me/zhengjie/modules/dm/api/domain/DmApi.java

@@ -61,6 +61,15 @@ public class DmApi extends BaseEntity implements Serializable {
             inverseJoinColumns = {@JoinColumn(name = "system_id",referencedColumnName = "id")})
     private List<DmSystem> dmSystems;
 
+
+    /**
+     * status 状态  0启用  1 禁用
+     */
+    @Column(name = "status")
+    @ApiModelProperty(value = " status 状态  0启用  1 禁用")
+    private String status;
+
+
 //    @Column(name = "storage_id")
 //    @ApiModelProperty(value = "接口配置文件id")
 //    private Long storageId;

eladmin-system/src/main/java/me/zhengjie/modules/dm/api/repository/DmApiRepository.java

@@ -16,8 +16,14 @@
 package me.zhengjie.modules.dm.api.repository;
 
 import me.zhengjie.modules.dm.api.domain.DmApi;
+import me.zhengjie.modules.dm.api.service.dto.DmApiDto;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 /**
 * @website https://el-admin.vip
@@ -25,4 +31,9 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 * @date 2021-11-30
 **/
 public interface DmApiRepository extends JpaRepository<DmApi, Integer>, JpaSpecificationExecutor<DmApi> {
+
+
+    @Transactional
+    @Query(value = "SELECT * FROM dm_api api left join dm_system_api sysapi on  api.id = sysapi.api_id left join dm_system sys on sys.id = sysapi.system_id where sys.id = :systemId AND  api.status = :status",nativeQuery = true)
+    List<DmApi> findByIdAndStatus(@Param("systemId") Integer systemId,@Param("status") Integer status);
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/api/rest/DmApiController.java

@@ -97,4 +97,12 @@ public class DmApiController {
         return new ResponseEntity<>(dmSystemService.findById(systemId),HttpStatus.OK);
     }
 
+    @Log("根据子系统查询接口")
+    @ApiOperation("根据子系统查询接口")
+    @GetMapping(value = "/findByIdAndStatus")
+    @PreAuthorize("@el.check('dmApi:list')")
+    public ResponseEntity<Object> findByIdAndStatus(@RequestParam("systemId") Integer systemId,@RequestParam("status")Integer status) {
+        return new ResponseEntity<>(dmApiService.findByIdAndStatus(systemId,status),HttpStatus.OK);
+    }
+
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/api/service/DmApiService.java

@@ -80,4 +80,12 @@ public interface DmApiService {
     * @throws IOException /
     */
     void download(List<DmApiDto> all, HttpServletResponse response) throws IOException;
+
+    /**
+     * 根据系统id和接口状态查询
+     * @param systemId
+     * @param status
+     * @return
+     */
+    List<DmApiDto> findByIdAndStatus(Integer systemId, Integer status);
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/api/service/dto/DmApiDto.java

@@ -62,4 +62,6 @@ public class DmApiDto extends BaseDTO implements Serializable {
 
     /** 更新时间 */
     private Timestamp updateTime;
+  /** status 0启动 1禁用  */
+    private String status;
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/api/service/impl/DmApiServiceImpl.java

@@ -107,4 +107,9 @@ public class DmApiServiceImpl implements DmApiService {
         }
         FileUtil.downloadExcel(list, response);
     }
+
+    @Override
+    public List<DmApiDto> findByIdAndStatus(Integer systemId, Integer status) {
+        return  dmApiMapper.toDto(dmApiRepository.findByIdAndStatus(systemId,status));
+    }
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/system/service/DmSystemService.java

@@ -87,4 +87,5 @@ public interface DmSystemService {
      * @return DmSystem
      */
     List<DmSystem> findByUserId(String userId);
+
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/system/service/dto/DmSystemQueryCriteria.java

@@ -26,4 +26,11 @@ import me.zhengjie.annotation.Query;
 **/
 @Data
 public class DmSystemQueryCriteria{
+
+
+    /**
+     * 子系统名称
+     */
+    @Query(type = Query.Type.EQUAL)
+    private String systemName;
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/system/service/impl/DmSystemServiceImpl.java

@@ -109,4 +109,5 @@ public class DmSystemServiceImpl implements DmSystemService {
     public List<DmSystem> findByUserId(String userId) {
         return dmSystemRepository.findByUserId(userId);
     }
+
 }

eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthorizationController.java

@@ -33,6 +33,7 @@ import me.zhengjie.modules.security.security.TokenProvider;
 import me.zhengjie.modules.security.service.dto.AuthUserDto;
 import me.zhengjie.modules.security.service.dto.JwtUserDto;
 import me.zhengjie.modules.security.service.OnlineUserService;
+import me.zhengjie.service.LocalStorageService;
 import me.zhengjie.utils.RsaUtils;
 import me.zhengjie.utils.RedisUtils;
 import me.zhengjie.utils.SecurityUtils;
@@ -66,6 +67,7 @@ public class AuthorizationController {
     private final RedisUtils redisUtils;
     private final OnlineUserService onlineUserService;
     private final TokenProvider tokenProvider;
+    private final LocalStorageService localStorageService;
     private final AuthenticationManagerBuilder authenticationManagerBuilder;
     @Resource
     private LoginProperties loginProperties;

eladmin-system/src/main/java/me/zhengjie/modules/thirdparty/v1/UserApiController.java

@@ -17,6 +17,7 @@ import me.zhengjie.base.QueryPageParams;
 import me.zhengjie.config.RsaProperties;
 import me.zhengjie.domain.LocalStorage;
 import me.zhengjie.exception.BadRequestException;
+import me.zhengjie.modules.dm.api.service.DmApiService;
 import me.zhengjie.modules.dm.user.domain.DmUser;
 import me.zhengjie.modules.dm.user.service.DmUserService;
 import me.zhengjie.modules.dm.user.service.dto.DmUserDto;
@@ -80,7 +81,7 @@ public class UserApiController {
     private final UserRepository userRepository;
     private final UserMapper userMapper;
     private final String erpapiUrl = "https://portal.caih.com";
-
+    private final DmApiService dmApiService;
     private final String key = "DMERPYT!@#$QWER2021+{:>";
 
 
@@ -267,6 +268,7 @@ public class UserApiController {
         if(passwordEncoder.matches(newPass, user.getPassword())){
             throw new BadRequestException("新密码不能与旧密码相同");
         }
+        System.out.println(passwordEncoder.encode(newPass));
         userService.updatePass(user.getUsername(),passwordEncoder.encode(newPass));
         return new BaseResponse(null);
     }
@@ -379,4 +381,12 @@ public class UserApiController {
         SecurityUtils.CheckApiAuth(params);
         return new BaseResponse<>(userService.queryAll(params.getQuery(), pageable));
     }
+
+
+    @Log("根据子系统查询接口")
+    @ApiOperation("根据子系统查询接口")
+    @AnonymousGetMapping(value = "/findByIdAndStatus")
+    public ResponseEntity<Object> findByIdAndStatus(@RequestParam("systemId") Integer systemId,@RequestParam("status")Integer status) {
+        return new ResponseEntity<>(dmApiService.findByIdAndStatus(systemId,status),HttpStatus.OK);
+    }
 }