java110 лет назад: 5
Родитель
Сommit
c02aabea35

+ 1 - 1
java110-generator/src/main/resources/back/template_1.json

@@ -1,5 +1,5 @@
 {
-  "autoMove": true,
+  "autoMove": false,
   "id": "locationId",
   "name": "communityLocation",
   "desc": "小区位置",

+ 0 - 5
pom.xml

@@ -163,11 +163,6 @@
                 <artifactId>java110-db</artifactId>
                 <version>${microcommunity.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.java110</groupId>
-                <artifactId>java110-front</artifactId>
-                <version>${microcommunity.version}</version>
-            </dependency>
             <!-- logback 日志组件支持  -->
 
             <dependency>

+ 10 - 0
service-api/src/main/java/com/java110/api/listener/AbstractServiceApiPlusListener.java

@@ -288,6 +288,16 @@ public abstract class AbstractServiceApiPlusListener extends AbstractServiceApiD
 
     /**
      * 新增数据方法
+     * {
+     *     HTTP_BUSINESS_TYPE_CD:"",
+     *     HTTP_SEQ:"",
+     *     HTTP_INVOKE_MODEL:""
+     *     datas:{
+     *
+     *         a:1,
+     *         b:2
+     *     }
+     * }
      *
      * @param context 上下文对象
      * @param param   po对象

+ 5 - 0
service-api/src/main/java/com/java110/api/listener/activities/DeleteActivitiesListener.java

@@ -6,6 +6,7 @@ import com.java110.api.listener.AbstractServiceApiPlusListener;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
 import com.java110.core.event.service.api.ServiceDataFlowEvent;
+import com.java110.core.smo.community.IActivitiesInnerServiceSMO;
 import com.java110.po.activities.ActivitiesPo;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.constant.ServiceCodeActivitiesConstant;
@@ -23,6 +24,9 @@ public class DeleteActivitiesListener extends AbstractServiceApiPlusListener {
     @Autowired
     private IActivitiesBMO activitiesBMOImpl;
 
+    @Autowired
+    private IActivitiesInnerServiceSMO activitiesInnerServiceSMOImpl;
+
     @Override
     protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
         //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
@@ -38,6 +42,7 @@ public class DeleteActivitiesListener extends AbstractServiceApiPlusListener {
 
         super.delete(context, activitiesPo, BusinessTypeConstant.BUSINESS_TYPE_DELETE_ACTIVITIES);
 
+
     }
 
     @Override

+ 4 - 0
service-front/pom.xml

@@ -59,6 +59,10 @@
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>junit</groupId>

+ 21 - 0
service-front/src/main/java/com/java110/front/configuration/WebSocketConfig.java

@@ -0,0 +1,21 @@
+package com.java110.front.configuration;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.socket.server.standard.ServerEndpointExporter;
+
+/**
+ * @ClassName WebSocketConfig
+ * @Description TODO
+ * @Author wuxw
+ * @Date 2020/5/25 12:10
+ * @Version 1.0
+ * add by wuxw 2020/5/25
+ **/
+@Configuration
+public class WebSocketConfig {
+    @Bean
+    public ServerEndpointExporter serverEndpointExporter() {
+        return new ServerEndpointExporter();
+    }
+}

+ 3 - 5
service-front/src/main/java/com/java110/front/smo/mapping/impl/AddMappingSMOImpl.java

@@ -14,7 +14,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
 
-
 /**
  * 添加小区服务实现类
  * add by wuxw 2019-06-30
@@ -32,10 +31,9 @@ public class AddMappingSMOImpl extends AbstractComponentSMO implements IAddMappi
 
         //Assert.hasKeyAndValue(paramIn, "xxx", "xxx");
         Assert.hasKeyAndValue(paramIn, "domain", "必填,请填写域");
-Assert.hasKeyAndValue(paramIn, "name", "必填,请填写名称");
-Assert.hasKeyAndValue(paramIn, "key", "必填,请填写键");
-Assert.hasKeyAndValue(paramIn, "value", "必填,请填写值");
-
+        Assert.hasKeyAndValue(paramIn, "name", "必填,请填写名称");
+        Assert.hasKeyAndValue(paramIn, "key", "必填,请填写键");
+        Assert.hasKeyAndValue(paramIn, "value", "必填,请填写值");
 
 
         super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.AGENT_HAS_LIST_MAPPING);