From a1abd1e4ddf15d3ce1d3d0b22e7c7ac924d63e43 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 14 九月 2023 16:14:04 +0800
Subject: [PATCH] 新增川工之家接口模块
---
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/config/SwaggerConfig.java | 3
springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/resources/logback-spring.xml | 51 ++++
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_grid/config/MyMetaObjectHandler.class | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityUnionService.java | 141 +++++++++++
springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huachengunion_applets/HuachengUnionAppletsApplication.java | 25 ++
springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huachengunion_applets/config/JacksonConfig.java | 31 ++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/union/StructuredVO.java | 89 +++++++
springcloud_k8s_panzhihuazhihuishequ/.idea/misc.xml | 3
springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huachengunion_applets/api/UnionReportApi.java | 46 +++
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/RoomckWebApi.java | 3
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/service/impl/UnionOutdoorSiteServiceImpl.class | 0
springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huachengunion_applets/api/RoomckWebApi.java | 31 ++
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_grid/model/helper/sensitive/SensitiveInterceptor.class | 0
springcloud_k8s_panzhihuazhihuishequ/.idea/encodings.xml | 4
springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huachengunion_applets/api/UnionInspectionApi.java | 49 ++++
springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huachengunion_applets/config/SwaggerConfig.java | 31 ++
springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huachengunion_applets/api/UnionOutdoorLaborDynamicApi.java | 41 +++
springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huachengunion_applets/api/UnionOutdoorSiteApi.java | 44 +++
springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huachengunion_applets/api/UnionUserApi.java | 56 ++++
springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/resources/bootstrap.yml | 40 +++
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/api/RoomckWebApi.class | 0
21 files changed, 686 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/.idea/encodings.xml b/springcloud_k8s_panzhihuazhihuishequ/.idea/encodings.xml
index c36b18e..d426262 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/.idea/encodings.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/.idea/encodings.xml
@@ -31,12 +31,16 @@
<file url="file://$PROJECT_DIR$/grid_backstage" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/grid_backstage/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/grid_backstage/src/main/resources" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/huacheng_union_applets/src/main/java" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/huacheng_union_applets/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/service_api" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/service_api/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/service_api/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/service_community" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/service_community/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/service_community/src/main/resources" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/service_equipment/src/main/java" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/service_equipment/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/service_grid" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/service_grid/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/service_grid/src/main/resources" charset="UTF-8" />
diff --git a/springcloud_k8s_panzhihuazhihuishequ/.idea/misc.xml b/springcloud_k8s_panzhihuazhihuishequ/.idea/misc.xml
index 8dcc40f..a990737 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/.idea/misc.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/.idea/misc.xml
@@ -17,6 +17,9 @@
<option value="$PROJECT_DIR$/service_user/pom.xml" />
<option value="$PROJECT_DIR$/service_community/pom.xml" />
<option value="$PROJECT_DIR$/timejob/pom.xml" />
+ <option value="$PROJECT_DIR$/service_equipment/pom.xml" />
+ <option value="$PROJECT_DIR$/huacheng-union_applets/pom.xml" />
+ <option value="$PROJECT_DIR$/huacheng_union_applets/pom.xml" />
</list>
</option>
</component>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/union/StructuredVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/union/StructuredVO.java
new file mode 100644
index 0000000..70aec17
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/union/StructuredVO.java
@@ -0,0 +1,89 @@
+package com.panzhihua.common.model.vos.union;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("结构化数据类")
+@Data
+public class StructuredVO {
+
+ @ApiModelProperty("跟踪 ID")
+ private String traceId;
+
+ @ApiModelProperty("结构化 ID")
+ private String structuredId;
+
+ @ApiModelProperty("外部设备 ID")
+ private String extDeviceId;
+
+ @ApiModelProperty("设备编码")
+ private String deviceCode;
+
+ @ApiModelProperty("平台编码")
+ private String platformCode;
+
+ @ApiModelProperty("应用密钥")
+ private String appKey;
+
+ @ApiModelProperty("能力编码")
+ private String abilityCode;
+
+ @ApiModelProperty("能力版本")
+ private String abilityVersion;
+
+ @ApiModelProperty("API ID")
+ private Long apiId;
+
+ @ApiModelProperty("创建时间")
+ private Long gmtCreate;
+
+ @ApiModelProperty("设备名称")
+ private String deviceName;
+
+ @ApiModelProperty("设备 ID")
+ private Long deviceId;
+
+ @ApiModelProperty("组织 ID")
+ private Long orgId;
+
+ @ApiModelProperty("结构化数据")
+ private String structuredData;
+
+ @ApiModelProperty("图片路径")
+ private String picPath;
+
+ @ApiModelProperty("图片 Base64")
+ private String imageBase64;
+
+ @ApiModelProperty("视频 Base64")
+ private String videoBase64;
+
+ @ApiModelProperty("视频路径")
+ private String videoPath;
+
+ @ApiModelProperty("能力名称")
+ private String abilityName;
+
+ @ApiModelProperty("能力 ID")
+ private Long abilityId;
+
+ @ApiModelProperty("识别结果")
+ private String recognitionResult;
+
+ @ApiModelProperty("帧时间")
+ private String frameTime;
+
+ @ApiModelProperty("API 参数")
+ private String apiParams;
+
+ @ApiModelProperty("平台代码")
+ private String plaformCode;
+
+ @ApiModelProperty("预设图像路径")
+ private String presetImagePath;
+
+ @ApiModelProperty("事件临时名称")
+ private String eventTempName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityUnionService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityUnionService.java
new file mode 100644
index 0000000..30a18b0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityUnionService.java
@@ -0,0 +1,141 @@
+package com.panzhihua.common.service.community;
+
+import com.panzhihua.common.model.dtos.equipment.*;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.ResultData;
+import com.panzhihua.common.model.vos.union.StructuredVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * 川工之家
+ */
+@FeignClient(name = "equipment")
+public interface CommunityUnionService
+{
+
+ /**
+ * 新闻基本面,技术面相关接口
+ * @param structureds
+ * @return
+ */
+ @PostMapping("/roomck-web/roomck/ivsCommomEventController")
+ public ResultData ivsCommomEventController(@RequestBody List<StructuredVO> structureds);
+
+
+ /**
+ * 新增户外劳工站巡查
+ *
+ * @param unionInspectionDto
+ * @return 新增结果
+ */
+ @PostMapping("/unionInspection/add")
+ public R add(@RequestBody UnionInspectionDto unionInspectionDto);
+
+
+ /**
+ * 分页户外劳工站巡查
+ *
+ * @param unionInspectionDto
+ * @return 动态结果
+ */
+ @PostMapping("/unionInspection/query")
+ public R query(@RequestBody UnionInspectionDto unionInspectionDto);
+
+
+ /**
+ * 分页总工会-户外劳工站-动态
+ *
+ * @param unionOutdoorLaborDynamicDto
+ * @return 动态结果
+ */
+ @PostMapping("/unionOutdoorLaborDynamic/page")
+ R unionOutdoorLaborDynamicQuery(@RequestBody UnionOutdoorLaborDynamicDto unionOutdoorLaborDynamicDto);
+
+ /**
+ * 查询总工会-户外劳工站-动态
+ *
+ * @param id
+ * 动态 id
+ * @return 查找结果
+ */
+ @GetMapping("/unionOutdoorLaborDynamic/{id}")
+ R unionOutdoorLaborDynamicDetail(@PathVariable("id") Long id) ;
+
+
+
+ /**
+ * 分页总工会户外劳工站
+ *
+ * @param unionOutdoorSiteDto
+ * @return 动态结果
+ */
+ @PostMapping("/unionOutdoorSite/page")
+ R unionOutdoorSitequery(@RequestBody UnionOutdoorSiteDto unionOutdoorSiteDto);
+
+ /**
+ * 查询总工会户外劳工站
+ *
+ * @param id
+ * 户外劳工站 id
+ * @return 查找结果
+ */
+ @GetMapping("/unionOutdoorSite/{id}")
+ R unionOutdoorSiteDetail(@PathVariable("id") Long id);
+
+
+
+
+
+ /**
+ * 户外劳工站上报表
+ *
+ * @param unionReportDto
+ * @return 新增结果
+ */
+ @PostMapping("/unionReport/add")
+ public R unionReportAdd(@RequestBody UnionReportDto unionReportDto);
+
+ /**
+ * 分页户外劳工站上报表
+ *
+ * @param unionReportDto
+ * @return 动态结果
+ */
+ @PostMapping("/unionReport/query")
+ public R unionReportQuery(@RequestBody UnionReportDto unionReportDto);
+
+
+
+
+
+ /**
+ * 总工会户外劳登录
+ *
+ * @param loginUserInfoVO
+ * @return 总工会户外劳共用户
+ */
+ @PostMapping("/unionUser/login")
+ public R unionUserLogin(@RequestBody LoginUserInfoVO loginUserInfoVO);
+
+ /**
+ * 总工会户外劳工站用户认证
+ *
+ * @param unionUserDto
+ * @return 总工会户外劳共用户
+ */
+ @PostMapping("/unionUser/authentication")
+ public R unionUserAuthentication(@RequestBody UnionUserDto unionUserDto);
+
+
+
+
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huachengunion_applets/HuachengUnionAppletsApplication.java b/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huachengunion_applets/HuachengUnionAppletsApplication.java
new file mode 100644
index 0000000..c99c6fc
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huachengunion_applets/HuachengUnionAppletsApplication.java
@@ -0,0 +1,25 @@
+package com.chuangongzhijia.huachengunion_applets;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.context.annotation.ComponentScan;
+
+import org.springframework.cloud.client.SpringCloudApplication;
+import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+@EnableSwagger2
+@SpringCloudApplication
+@EnableCircuitBreaker
+@EnableEurekaClient
+@EnableFeignClients(basePackages = {"com.panzhihua.common.service"})
+@ComponentScan({"com.chuangongzhijia.huachengunion_applets", "com.panzhihua.common"})
+public class HuachengUnionAppletsApplication {
+
+ public static void main(String[] args) {
+ SpringApplication.run(HuachengUnionAppletsApplication.class, args);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huachengunion_applets/api/RoomckWebApi.java b/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huachengunion_applets/api/RoomckWebApi.java
new file mode 100644
index 0000000..aa9991d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huachengunion_applets/api/RoomckWebApi.java
@@ -0,0 +1,31 @@
+package com.chuangongzhijia.huachengunion_applets.api;
+
+import com.panzhihua.common.model.vos.ResultData;
+import com.panzhihua.common.model.vos.union.StructuredVO;
+import com.panzhihua.common.service.community.CommunityUnionService;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+
+@Slf4j
+@Api(tags = {"新闻基本面,技术面相关接口"})
+@RestController
+@RequestMapping("/roomck-web")
+public class RoomckWebApi {
+
+ @Resource
+ private CommunityUnionService communityUnionService;
+
+ @PostMapping("/roomck/ivsCommomEventController")
+ public ResultData ivsCommomEventController(@RequestBody List<StructuredVO> structureds){
+ log.info("传输参数为{}",structureds);
+ return communityUnionService.ivsCommomEventController(structureds);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huachengunion_applets/api/UnionInspectionApi.java b/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huachengunion_applets/api/UnionInspectionApi.java
new file mode 100644
index 0000000..d83e543
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huachengunion_applets/api/UnionInspectionApi.java
@@ -0,0 +1,49 @@
+package com.chuangongzhijia.huachengunion_applets.api;
+
+import com.panzhihua.common.model.dtos.equipment.UnionInspectionDto;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.service.community.CommunityUnionService;
+import com.panzhihua.common.service.user.UserService;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+
+@Slf4j
+@Api(tags = {"户外劳工站巡查"})
+@RestController
+@RequestMapping("/unionInspection")
+public class UnionInspectionApi {
+
+ @Resource
+ private CommunityUnionService communityUnionService;
+
+ /**
+ * 新增户外劳工站巡查
+ *
+ * @param unionInspectionDto
+ * @return 新增结果
+ */
+ @PostMapping("/add")
+ public R add(@RequestBody UnionInspectionDto unionInspectionDto) {
+ return communityUnionService.add(unionInspectionDto);
+ }
+
+
+ /**
+ * 分页户外劳工站巡查
+ *
+ * @param unionInspectionDto
+ * @return 动态结果
+ */
+ @PostMapping("/query")
+ public R query(@RequestBody UnionInspectionDto unionInspectionDto) {
+ return communityUnionService.query(unionInspectionDto);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huachengunion_applets/api/UnionOutdoorLaborDynamicApi.java b/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huachengunion_applets/api/UnionOutdoorLaborDynamicApi.java
new file mode 100644
index 0000000..9758e3e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huachengunion_applets/api/UnionOutdoorLaborDynamicApi.java
@@ -0,0 +1,41 @@
+package com.chuangongzhijia.huachengunion_applets.api;
+
+import com.panzhihua.common.model.dtos.equipment.UnionOutdoorLaborDynamicDto;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.service.community.CommunityUnionService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@Slf4j
+@RestController
+@RequestMapping("/unionOutdoorLaborDynamic")
+public class UnionOutdoorLaborDynamicApi {
+
+ @Resource
+ private CommunityUnionService communityUnionService;
+
+ /**
+ * 分页总工会-户外劳工站-动态
+ *
+ * @param unionOutdoorLaborDynamicDto
+ * @return 动态结果
+ */
+ @PostMapping("/page")
+ R query(@RequestBody UnionOutdoorLaborDynamicDto unionOutdoorLaborDynamicDto) {
+ return communityUnionService.unionOutdoorLaborDynamicQuery(unionOutdoorLaborDynamicDto);
+ }
+
+ /**
+ * 查询总工会-户外劳工站-动态
+ *
+ * @param id
+ * 动态 id
+ * @return 查找结果
+ */
+ @GetMapping("/{id}")
+ R unionOutdoorLaborDynamicDetail(@PathVariable("id") Long id) {
+ return communityUnionService.unionOutdoorLaborDynamicDetail(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huachengunion_applets/api/UnionOutdoorSiteApi.java b/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huachengunion_applets/api/UnionOutdoorSiteApi.java
new file mode 100644
index 0000000..d939377
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huachengunion_applets/api/UnionOutdoorSiteApi.java
@@ -0,0 +1,44 @@
+package com.chuangongzhijia.huachengunion_applets.api;
+
+import com.panzhihua.common.model.dtos.equipment.UnionOutdoorSiteDto;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.service.community.CommunityUnionService;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@Slf4j
+@Api(tags = {"总工会户外劳工站"})
+@RestController
+@RequestMapping("/unionOutdoorSite")
+public class UnionOutdoorSiteApi {
+
+ @Resource
+ private CommunityUnionService communityUnionService;
+
+
+ /**
+ * 分页总工会户外劳工站
+ *
+ * @param unionOutdoorSiteDto
+ * @return 动态结果
+ */
+ @PostMapping("/page")
+ R query(@RequestBody UnionOutdoorSiteDto unionOutdoorSiteDto) {
+ return communityUnionService.unionOutdoorSitequery(unionOutdoorSiteDto);
+ }
+
+ /**
+ * 查询总工会户外劳工站
+ *
+ * @param id
+ * 户外劳工站 id
+ * @return 查找结果
+ */
+ @GetMapping("/{id}")
+ R unionOutdoorSiteDetail(@PathVariable("id") Long id) {
+ return communityUnionService.unionOutdoorSiteDetail(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huachengunion_applets/api/UnionReportApi.java b/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huachengunion_applets/api/UnionReportApi.java
new file mode 100644
index 0000000..6c435b6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huachengunion_applets/api/UnionReportApi.java
@@ -0,0 +1,46 @@
+package com.chuangongzhijia.huachengunion_applets.api;
+
+import com.panzhihua.common.model.dtos.equipment.UnionReportDto;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.service.community.CommunityUnionService;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@Slf4j
+@Api(tags = {"户外劳工站"})
+@RestController
+@RequestMapping("/unionReport")
+public class UnionReportApi {
+
+ @Resource
+ private CommunityUnionService communityUnionService;
+
+ /**
+ * 户外劳工站上报表
+ *
+ * @param unionReportDto
+ * @return 新增结果
+ */
+ @PostMapping("/add")
+ public R add(@RequestBody UnionReportDto unionReportDto) {
+ return communityUnionService.unionReportAdd(unionReportDto);
+ }
+
+
+ /**
+ * 分页户外劳工站上报表
+ *
+ * @param unionReportDto
+ * @return 动态结果
+ */
+ @PostMapping("/query")
+ public R query(@RequestBody UnionReportDto unionReportDto) {
+ return communityUnionService.unionReportQuery(unionReportDto);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huachengunion_applets/api/UnionUserApi.java b/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huachengunion_applets/api/UnionUserApi.java
new file mode 100644
index 0000000..09ca0b5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huachengunion_applets/api/UnionUserApi.java
@@ -0,0 +1,56 @@
+package com.chuangongzhijia.huachengunion_applets.api;
+
+import com.panzhihua.common.model.dtos.equipment.UnionUserDto;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActDpcVO;
+import com.panzhihua.common.service.community.CommunityUnionService;
+import com.panzhihua.common.service.user.UserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@Slf4j
+@Api(tags = {"用户相关"})
+@RestController
+@RequestMapping("/unionUser")
+public class UnionUserApi {
+
+ @Resource
+ private CommunityUnionService communityUnionService;
+
+
+ @Resource
+ private UserService userService;
+ /**
+ * 总工会户外劳登录
+ *
+ * @param loginUserInfoVO
+ * @return 总工会户外劳共用户
+ */
+ @ApiOperation(value = "总工会户外劳登录")
+ @PostMapping("/login")
+ public R login(){
+ LoginUserInfoVO userInfoByUserId = userService.getUserInfoByUserId("1588095866109984769").getData();
+ return communityUnionService.unionUserLogin(userInfoByUserId);
+ }
+
+ /**
+ * 总工会户外劳工站用户认证
+ *
+ * @param unionUserDto
+ * @return 总工会户外劳共用户
+ */
+ @ApiOperation(value = "总工会户外劳工站用户认证")
+ @PostMapping("/authentication")
+ public R authentication(@RequestBody UnionUserDto unionUserDto){
+ return communityUnionService.unionUserAuthentication(unionUserDto);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huachengunion_applets/config/JacksonConfig.java b/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huachengunion_applets/config/JacksonConfig.java
new file mode 100644
index 0000000..c0a5e23
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huachengunion_applets/config/JacksonConfig.java
@@ -0,0 +1,31 @@
+package com.chuangongzhijia.huachengunion_applets.config;
+
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
+
+@Configuration
+public class JacksonConfig {
+
+ @Bean
+ @Primary
+ @ConditionalOnMissingBean(ObjectMapper.class)
+ public ObjectMapper jacksonObjectMapper(Jackson2ObjectMapperBuilder builder)
+ {
+ ObjectMapper objectMapper = builder.createXmlMapper(false).build();
+
+ // 全局配置序列化返回 JSON 处理
+ SimpleModule simpleModule = new SimpleModule();
+ //JSON Long ==> String
+ simpleModule.addSerializer(Long.class, ToStringSerializer.instance);
+ objectMapper.registerModule(simpleModule);
+ return objectMapper;
+ }
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huachengunion_applets/config/SwaggerConfig.java b/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huachengunion_applets/config/SwaggerConfig.java
new file mode 100644
index 0000000..ff6fcf6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huachengunion_applets/config/SwaggerConfig.java
@@ -0,0 +1,31 @@
+package com.chuangongzhijia.huachengunion_applets.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Contact;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: swagger3
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-19 16:08
+ **/
+@Configuration
+public class SwaggerConfig {
+ @Bean
+ public Docket createRestApi() {
+ return new Docket(DocumentationType.SWAGGER_2).apiInfo(apiInfo()).enable(true).select()
+// .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+ .apis(RequestHandlerSelectors.basePackage("com.panzhihua.huacheng_union_applets")).build();
+ }
+
+ private ApiInfo apiInfo() {
+ return new ApiInfoBuilder().title("川工之家开发文档").description("。").contact(new Contact("huanghongfa", "", ""))
+ .version("1.0").build();
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/resources/bootstrap.yml b/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000..9c1203e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/resources/bootstrap.yml
@@ -0,0 +1,40 @@
+spring:
+ application:
+ name: huacheng_union_applets
+ cloud:
+ config:
+ discovery:
+ enabled: true
+ service-id: huacheng-config # 注册中心的服务名
+ profile: ${ENV:dev} # 指定配置文件的环境
+ uri: http://${CONFIG_URL:localhost}:6193/
+ profiles:
+ active: ${ENV:dev}
+ servlet:
+ multipart:
+ max-file-size: 200MB
+ max-request-size: 200MB
+
+server:
+ max-http-header-size: 10MB
+
+eureka:
+ client:
+ service-url:
+ defaultZone: http://${EUREKA_URL:localhost}:8192/eureka
+
+
+management:
+ endpoints:
+ web:
+ exposure:
+ include: '*'
+
+ endpoint:
+ health:
+ show-details: always
+
+ metrics:
+ tags:
+ application: huacheng_union_applets
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/resources/logback-spring.xml b/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000..99cb522
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/resources/logback-spring.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+ <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
+ <springProfile name="dev">
+ <property name="LOG_HOME" value="F:/log" />
+ </springProfile>
+ <springProfile name="test">
+ <property name="LOG_HOME" value="/mnt/data/gocd/log" />
+ </springProfile>
+<property name="LOG_HOME" value="/mnt/data/gocd/log" />
+ <!-- 控制台输出 -->
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+ <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+ </encoder>
+ </appender>
+ <!-- 按照每天生成日志文件 -->
+ <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <!--日志文件输出的文件名-->
+ <FileNamePattern>${LOG_HOME}/huachengapplets.log.%d{yyyy-MM-dd}.log</FileNamePattern>
+ <!--日志文件保留天数-->
+ <MaxHistory>30</MaxHistory>
+ </rollingPolicy>
+ <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+ <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+ </encoder>
+ <!--日志文件最大的大小-->
+ <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+ <MaxFileSize>10MB</MaxFileSize>
+ </triggeringPolicy>
+ </appender>
+
+ <!--myibatis log configure-->
+ <logger name="com.apache.ibatis" level="TRACE"/>
+ <logger name="java.sql.Connection" level="DEBUG"/>
+ <logger name="java.sql.Statement" level="DEBUG"/>
+ <logger name="java.sql.PreparedStatement" level="DEBUG"/>
+ <logger name="com.panzhihua.applets" level="DEBUG"/>
+
+ <!-- 日志输出级别 -->
+ <root level="DEBUG">
+ <appender-ref ref="STDOUT" />
+ </root>
+ <root level="INFO">
+ <appender-ref ref="STDOUT" />
+ <appender-ref ref="FILE" />
+ </root>
+</configuration>
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/RoomckWebApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/RoomckWebApi.java
index 809d391..a00217e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/RoomckWebApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/RoomckWebApi.java
@@ -1,6 +1,7 @@
package com.panzhihua.service_equipment.api;
import com.panzhihua.common.model.vos.ResultData;
+import com.panzhihua.common.model.vos.union.StructuredVO;
import com.panzhihua.service_equipment.model.dos.Structured;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
@@ -18,7 +19,7 @@
public class RoomckWebApi {
@PostMapping("/roomck/ivsCommomEventController")
- public ResultData ivsCommomEventController(@RequestBody List<Structured> structureds){
+ public ResultData ivsCommomEventController(@RequestBody List<StructuredVO> structureds){
log.info("传输参数为{}",structureds);
return ResultData.normal(structureds);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/api/RoomckWebApi.class b/springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/api/RoomckWebApi.class
index b109219..2b47ed0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/api/RoomckWebApi.class
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/api/RoomckWebApi.class
Binary files differ
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/service/impl/UnionOutdoorSiteServiceImpl.class b/springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/service/impl/UnionOutdoorSiteServiceImpl.class
index 4fc4463..b69ae01 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/service/impl/UnionOutdoorSiteServiceImpl.class
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/service/impl/UnionOutdoorSiteServiceImpl.class
Binary files differ
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_grid/config/MyMetaObjectHandler.class b/springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_grid/config/MyMetaObjectHandler.class
index 26b38ca..520d9e7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_grid/config/MyMetaObjectHandler.class
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_grid/config/MyMetaObjectHandler.class
Binary files differ
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_grid/model/helper/sensitive/SensitiveInterceptor.class b/springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_grid/model/helper/sensitive/SensitiveInterceptor.class
index d40d519..a2a946c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_grid/model/helper/sensitive/SensitiveInterceptor.class
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_grid/model/helper/sensitive/SensitiveInterceptor.class
Binary files differ
diff --git a/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/config/SwaggerConfig.java b/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/config/SwaggerConfig.java
index ddb6781..a3e995d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/config/SwaggerConfig.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/config/SwaggerConfig.java
@@ -28,7 +28,8 @@
private final RouteLocator routeLocator;
private String[] ids =
- new String[] {"huacheng-appletsbackstage", "huacheng-applets", "huacheng-communitybackstage", "huacheng-shopbackstage", "huacheng-gridbackstage", "huacheng-gridapp"};
+ new String[] {"huacheng-appletsbackstage", "huacheng-applets", "huacheng-communitybackstage", "huacheng-shopbackstage",
+ "huacheng-gridbackstage", "huacheng-gridapp","huacheng_union_applets"};
public SwaggerConfig(RouteLocator routeLocator) {
this.routeLocator = routeLocator;
--
Gitblit v1.7.1