From e445fd5d268e234c842f14f8f4a4c820d3ece0e7 Mon Sep 17 00:00:00 2001 From: baize <3533151373@qq.com> Date: Tue, 11 Jun 2024 22:31:26 +0800 Subject: [PATCH] =?UTF-8?q?feat():=E7=AE=A1=E7=90=86=E5=91=98=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E9=80=9A=E8=BF=87=E8=B0=83=E7=94=A8=E5=BB=BA=E6=9C=A8?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E7=94=9F=E6=88=90mysql=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../muyu-net-working-common/pom.xml | 1 + .../muyu/net/working/domain/Enterprise.java | 7 +-- .../working/domain/req/EnterpriseEditReq.java | 1 + .../muyu-net-working-remote/pom.xml | 12 ---- ...ot.autoconfigure.AutoConfiguration.imports | 0 .../controller/EnterpriseController.java | 19 +++++- .../net/working/mapper/EnterpriseMapper.java | 3 + .../working/service/EnterpriseService.java | 4 ++ .../service/impl/EnterpriseServiceImpl.java | 61 +++++++++++++++++-- .../mapper/netWorking/EnterpriseMapper.xml | 3 + 10 files changed, 90 insertions(+), 21 deletions(-) delete mode 100644 muyu-modules/muyu-net-working/muyu-net-working-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/muyu-modules/muyu-net-working/muyu-net-working-common/pom.xml b/muyu-modules/muyu-net-working/muyu-net-working-common/pom.xml index bc8acc3..a4c4f8e 100644 --- a/muyu-modules/muyu-net-working/muyu-net-working-common/pom.xml +++ b/muyu-modules/muyu-net-working/muyu-net-working-common/pom.xml @@ -17,6 +17,7 @@ UTF-8 + com.muyu muyu-common-core diff --git a/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/Enterprise.java b/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/Enterprise.java index 32dd0ca..5897373 100644 --- a/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/Enterprise.java +++ b/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/Enterprise.java @@ -38,7 +38,7 @@ public class Enterprise extends BaseEntity { /** 主键 */ @TableId(value = "id",type = IdType.AUTO) @ApiModelProperty(name = "主键", value = "主键") - private String id; + private Integer id; /** 企业名称 */ @Excel(name = "企业名称") @@ -169,11 +169,10 @@ public class Enterprise extends BaseEntity { /** * 修改构造器 */ - public static Enterprise editBuild(String id, EnterpriseEditReq enterpriseEditReq){ + public static Enterprise editBuild(Integer id, EnterpriseEditReq enterpriseEditReq){ return Enterprise.builder() .id(id) - .ebterpriseName(enterpriseEditReq.getEbterpriseName()) - .legalPerson(enterpriseEditReq.getLegalPerson()) + .ebterpriseName(enterpriseEditReq.getEbterpriseName()) .legalPerson(enterpriseEditReq.getLegalPerson()) .businessLincenseNumber(enterpriseEditReq.getBusinessLincenseNumber()) .estabinessDate(enterpriseEditReq.getEstabinessDate()) .businessScope(enterpriseEditReq.getBusinessScope()) diff --git a/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseEditReq.java b/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseEditReq.java index ede1a6e..50f92c7 100644 --- a/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseEditReq.java +++ b/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseEditReq.java @@ -9,6 +9,7 @@ import lombok.AllArgsConstructor; import lombok.experimental.SuperBuilder; import io.swagger.annotations.*; import com.muyu.common.core.web.domain.BaseEntity; +import org.springframework.format.annotation.DateTimeFormat; /** * 车辆运营平台对象 enterprise diff --git a/muyu-modules/muyu-net-working/muyu-net-working-remote/pom.xml b/muyu-modules/muyu-net-working/muyu-net-working-remote/pom.xml index 9b84764..7fa8fbb 100644 --- a/muyu-modules/muyu-net-working/muyu-net-working-remote/pom.xml +++ b/muyu-modules/muyu-net-working/muyu-net-working-remote/pom.xml @@ -17,18 +17,6 @@ UTF-8 - - org.springframework.cloud - spring-cloud-openfeign-core - - - com.muyu - muyu-common-security - - - com.muyu - muyu-common-core - diff --git a/muyu-modules/muyu-net-working/muyu-net-working-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/muyu-modules/muyu-net-working/muyu-net-working-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index e69de29..0000000 diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/controller/EnterpriseController.java b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/controller/EnterpriseController.java index 48f3962..9220ffa 100644 --- a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/controller/EnterpriseController.java +++ b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/controller/EnterpriseController.java @@ -157,7 +157,7 @@ public class EnterpriseController extends BaseController { @Log(title = "车辆运营平台", businessType = BusinessType.UPDATE) @PutMapping("/{id}") @ApiOperation("修改车辆运营平台") - public Result edit(@PathVariable String id, @RequestBody EnterpriseEditReq enterpriseEditReq) { + public Result edit(@PathVariable Integer id, @RequestBody EnterpriseEditReq enterpriseEditReq) { return toAjax(enterpriseService.updateById(Enterprise.editBuild(id,enterpriseEditReq))); } @@ -182,4 +182,21 @@ public class EnterpriseController extends BaseController { return toAjax(enterpriseService.removeBatchByIds(ids)); } + + @PostMapping("/updateEnterprise/{id}") + public Result updateEnterprise(@PathVariable Integer id, @RequestBody EnterpriseEditReq enterpriseEditReq) { + return toAjax(enterpriseService.updateById(Enterprise.editBuild(id,enterpriseEditReq))); + } + + /** + * 企业认证 + */ + @PostMapping("/authentication") + public Result authentication(@RequestBody Enterprise enterprise ) { + enterpriseService.authentication(enterprise); + if(!enterprise.getEnterpriseStatus().equals("Y")){ + return Result.error("已经审核完成"); + } + return Result.success(); + } } diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/mapper/EnterpriseMapper.java b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/mapper/EnterpriseMapper.java index 3f75e8c..32673cd 100644 --- a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/mapper/EnterpriseMapper.java +++ b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/mapper/EnterpriseMapper.java @@ -1,6 +1,7 @@ package com.muyu.net.working.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.common.core.domain.Result; import com.muyu.net.working.domain.Enterprise; import org.apache.ibatis.annotations.Param; @@ -13,4 +14,6 @@ import org.apache.ibatis.annotations.Param; public interface EnterpriseMapper extends BaseMapper { Enterprise selectByName(@Param("name") String name); + + void authentication(Enterprise enterprise); } diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/EnterpriseService.java b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/EnterpriseService.java index 4c60039..9a905e0 100644 --- a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/EnterpriseService.java +++ b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/EnterpriseService.java @@ -1,6 +1,8 @@ package com.muyu.net.working.service; import java.util.List; + +import com.muyu.common.core.domain.Result; import com.muyu.net.working.domain.Enterprise; import com.baomidou.mybatisplus.extension.service.IService; @@ -20,4 +22,6 @@ public interface EnterpriseService extends IService { List list(Enterprise enterprise); Enterprise selectByName(String name); + + void authentication(Enterprise enterprise); } diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/impl/EnterpriseServiceImpl.java b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/impl/EnterpriseServiceImpl.java index adfc7f7..924fd5e 100644 --- a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/impl/EnterpriseServiceImpl.java +++ b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/impl/EnterpriseServiceImpl.java @@ -1,7 +1,16 @@ package com.muyu.net.working.service.impl; +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.net.HttpURLConnection; +import java.net.URL; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import com.alibaba.fastjson.JSON; +import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.ObjUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -95,10 +104,6 @@ public class EnterpriseServiceImpl extends ServiceImpl parammap = new HashMap<>(); + parammap.put("enterpriseId", "liu-"+enterprise.getId()); + parammap.put("mysqlPort", String.valueOf(3306+enterprise.getId())); + String json = JSON.toJSONString(parammap); + // 3.创建连接与设置连接参数 + URL urlObj = new URL(postUrl); + HttpURLConnection httpConn = (HttpURLConnection) urlObj.openConnection(); + httpConn.setRequestMethod("POST"); + httpConn.setRequestProperty("Charset", "UTF-8"); + // POST请求且JSON数据,必须设置 + httpConn.setRequestProperty("Content-Type", "application/json"); + // 打开输出流,默认是false + httpConn.setDoOutput(true); + // 打开输入流,默认是true,可省略 + httpConn.setDoInput(true); + // 4.从HttpURLConnection获取输出流和写数据 + OutputStream oStream = httpConn.getOutputStream(); + oStream.write(json.getBytes()); + oStream.flush(); + // 5.发起http调用(getInputStream触发http请求) + if (httpConn.getResponseCode() != 200) { + throw new Exception("调用服务端异常."); + } + // 6.从HttpURLConnection获取输入流和读数据 + BufferedReader br = new BufferedReader( + new InputStreamReader(httpConn.getInputStream())); + String resultData = br.readLine(); + System.out.println("从服务端返回结果: " + resultData); + // 7.关闭HttpURLConnection连接 + httpConn.disconnect(); + } + } diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/resources/mapper/netWorking/EnterpriseMapper.xml b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/resources/mapper/netWorking/EnterpriseMapper.xml index c7198cb..4ed8f18 100644 --- a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/resources/mapper/netWorking/EnterpriseMapper.xml +++ b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/resources/mapper/netWorking/EnterpriseMapper.xml @@ -31,6 +31,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, ebterprise_name, legal_person, business_lincense_number, estabiness_date, business_scope, address, contact_phone, email, enterprise_status, registration_date, certification_id, authentication_date, service_level, open_server_id, add_server_id, create_by, create_time, update_by, update_time, remark from enterprise + + update enterprise set enterprise_status = 'N' where id = #{id} +