代码同步

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/workflow/feign/WorkflowFeignService.java

@@ -214,4 +214,79 @@ public interface WorkflowFeignService {
 	    */
 	 @RequestMapping(value = "/activitiHistory/getTaskListForTaskName/{taskName}/{definitionKey}",method = RequestMethod.GET)
 	 JSONObject getTaskListForTaskName(@PathVariable String taskName,@PathVariable String definitionKey) throws Exception ;
+
+	/*
+   ////    * 发起流程
+   ////    **/
+	@RequestMapping(value = "/task/startTask", method = RequestMethod.POST)
+	JSONObject getTaskAssignDB( @RequestBody JSONObject variables);
+
+	/*
+	 * 任务详情
+	 **/
+	@RequestMapping(value = "/task/{taskId}", method = RequestMethod.GET)
+	JSONObject queryTaskDB(@PathVariable("taskId") String taskId);
+
+	/*
+	 * 发起流程
+	 **/
+	@RequestMapping(value = "/task/startProcess", method = RequestMethod.POST)
+	JSONObject startByVariableDB( @RequestBody HashMap<String, Object> variables);
+	/*
+	 * 所有已执行任务详情
+	 **/
+	@RequestMapping(value = "/activitiHistory/task/detail/{taskId}", method = RequestMethod.GET)
+	JSONObject queryHistoryTaskDetailDB(@PathVariable("taskId") String taskId);
+	/*
+	 * 我的待办
+	 **/
+	@RequestMapping(value = "/task", method = RequestMethod.POST)
+	JSONObject getTaskDB(@RequestParam(value="processInstanceId", required = false)  String processInstanceId);
+	/*
+	 * 我的待办
+	 **/
+	@RequestMapping(value = "/task/all-list", method = RequestMethod.GET)
+	JSONObject getTaskAssignDB(@RequestParam(value="userId", required=false)  String userId,
+							   @RequestParam(value="processDefinitionKey", required=false)  String processDefinitionKey);
+
+	/*
+	 * 我的待办
+	 **/
+	@RequestMapping(value = "/task/all-list", method = RequestMethod.GET)
+	JSONObject getTaskAssignDBuser(
+			@RequestParam(value="processDefinitionKey", required=false)  String processDefinitionKey);
+	/*
+	 * 所有已执行任务详情
+	 **/
+	@RequestMapping(value = "/activitiHistory/all-historytasks", method = RequestMethod.GET)
+	JSONObject queryAllHistoryTasksDB(@RequestParam(value="processDefinitionKey", required=false) String processDefinitionKey,
+									  @RequestParam(value="userId", required=false) String username);
+
+
+	/*
+	 * 所有已执行任务详情
+	 **/
+	@RequestMapping(value = "/activitiHistory/all-historytasks", method = RequestMethod.GET)
+	JSONObject queryAllHistoryTasksDBuser(@RequestParam(value="processDefinitionKey", required=false) String processDefinitionKey
+	);
+
+
+
+	/*
+	 * 所有已执行任务
+	 **/
+	@RequestMapping(value = "/task/pickupAndCompleteTask/{taskID}", method = RequestMethod.POST)
+	JSONObject pickupAndCompleteTaskDB(@PathVariable("taskID") String taskID,
+									   @RequestBody(required = false) JSONObject variable);
+	/*
+	 * 查询当前流程对应的可执行任务，无权限级别
+	 **/
+	@RequestMapping(value = "/task/getTaskNoAuth/{processInstanceId}", method = RequestMethod.GET)
+	JSONObject queryTaskNoAuthDB(@PathVariable("processInstanceId") String processInstanceId);
+	/*
+	 * 我的待办
+	 **/
+	@RequestMapping(value = "/task/list/all/{instanceId}", method = RequestMethod.GET)
+	JSONObject getTaskListDB(@PathVariable("instanceId") String instanceId);
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/enums/ConfigPageTopicEnum.java

@@ -16,7 +16,7 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum ConfigPageTopicEnum {
 
-    INTEGRATE("INTEGRATE_TOPIC/#", "集成页面统配主题");
+    INTEGRATE("$share/AMOS-EQUIPMANAGE/INTEGRATE_TOPIC/#", "集成页面统配主题");
 
 	private String topic;
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/config/EquipmentIotMqttReceiveConfig.java

@@ -122,8 +122,8 @@ public class EquipmentIotMqttReceiveConfig {
             list.add(defaultTopic);
         }
         list.addAll(ConfigPageTopicEnum.getEnumTopicList());          //大屏数据推送接口订阅
-        list.add("+/+/property"); // 添加iot車輛裝備數據上報事件监听
-        list.add("+/+/event"); // 添加iot事件监听
+        list.add("$share/AMOS-EQUIPMANAGE/+/+/property"); // 添加iot車輛裝備數據上報事件监听
+        list.add("$share/AMOS-EQUIPMANAGE/+/+/event"); // 添加iot事件监听
         String[] arr = list.toArray(new String[list.size()]);
         adapter = new MqttPahoMessageDrivenChannelAdapter(clientId + "_inbound", mqttPahoClientFactory(), arr);
         adapter.setCompletionTimeout(completionTimeout);

amos-boot-system-equip/src/main/resources/application.properties

@@ -89,6 +89,14 @@ dcs.x.hw.appKey=s+YkvQhwilx91TRJHhNDmw==
 # 故障告警/消防告警/跑马灯权限标识  true 机场 / false 电力
 equip.enabled =true
 
+management.security.enabled=true
+endpoints.enabled=false
+endpoints.health.enabled=true
+management.endpoint.health.show-details=never
+spring.security.user.name=admin
+spring.security.user.password=a1234560
+
+
 
 #management.endpoints.enabled-by-default=false
 ##  增加接口文档验证

amos-boot-system-fas/src/main/resources/application.properties

@@ -55,7 +55,7 @@ param.safetyIndexChange.cron = 0 0 2 * * ?
 param.weather.url = http://wthrcdn.etouch.cn/weather_mini?citykey=
 
 # 只用于初始化
-emqx.defaultTopic=mqtt_topic
+emqx.defaultTopic=$share/-${spring.application.name}/mqtt_topic
 
 ## 规则配置（风险管控及预案）
 rule.definition.load=false

amos-boot-system-jcs/src/main/resources/application.properties

@@ -39,8 +39,6 @@ spring.liquibase.enabled= false
 ## eureka properties:
 eureka.client.registry-fetch-interval-seconds=5
 eureka.instance.prefer-ip-address=true
-management.endpoint.health.show-details=always
-management.endpoints.web.exposure.include=*
 eureka.instance.health-check-url-path=/actuator/health
 eureka.instance.lease-expiration-duration-in-seconds=10
 eureka.instance.lease-renewal-interval-in-seconds=5
@@ -131,11 +129,10 @@ knife4j.basic.enable=true
 knife4j.basic.username= admin
 knife4j.basic.password= yeejoin@2020
 
-
-
-#阿里云实时语音识别参数
-speech-config.access-key-id=LTAI5t62oH95jgbjRiNXPsho
-speech-config.access-key-secret=shy9SpogYgcdDoyTB3bvP21VSRmz8n
-speech-config.app-key=FC84bGUpbNFrexoL
-
-mqtt.topic.command.car.jw=carCoordinates
+management.security.enabled=true
+endpoints.enabled=false
+endpoints.health.enabled=true
+management.endpoint.health.show-details=always
+management.endpoints.web.exposure.include=*
+spring.security.user.name=admin
+spring.security.user.password=a1234560
\ No newline at end of file
\ No newline at end of file

amos-boot-utils/amos-boot-utils-jpush/src/main/java/com/yeejoin/amos/JpushApplication.java

@@ -33,7 +33,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
 @EnableFeignClients
 @EnableAsync
 @EnableEurekaClient
-@ComponentScan({"org.typroject","com.yeejoin.amos"})
+@ComponentScan({"com.yeejoin.amos"})
 public class JpushApplication {
 
     private static final Logger logger = LoggerFactory.getLogger(JpushApplication.class);

amos-boot-utils/amos-boot-utils-jpush/src/main/java/com/yeejoin/amos/jpush/config/WebSecurityConfig.java

+package com.yeejoin.amos.jpush.config;
+
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+
+@Configuration
+@EnableWebSecurity
+public class WebSecurityConfig  extends WebSecurityConfigurerAdapter {
+    // 授权
+    @Override
+    protected void configure(HttpSecurity http) throws Exception {
+        http.csrf().disable()
+                .headers()
+                .frameOptions()
+                .disable()
+                .and()
+                .authorizeRequests()
+                .regexMatchers("^(?!/actuator).*$").permitAll()
+                .regexMatchers("/actuator/health").permitAll()
+                .regexMatchers("/actuator/info").permitAll()
+                .anyRequest().authenticated().and()
+                .formLogin();
+    }
+}
+

amos-boot-utils/pom.xml

@@ -13,6 +13,10 @@
     <packaging>pom</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
     </dependencies>