Переглянути джерело

站点管理基础信息查询

jichaobo 3 роки тому
батько
коміт
89b77bf1dd

+ 25 - 0
fiveep-controller/src/main/java/com/bizmatics/controller/MyConfiguration.java

@@ -0,0 +1,25 @@
+package com.bizmatics.controller;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.StringHttpMessageConverter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
+
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
+
+@Configuration
+public class MyConfiguration extends WebMvcConfigurationSupport {
+
+    @Override
+    protected void extendMessageConverters(List<HttpMessageConverter<?>> converters) {
+        // 解决controller返回字符串中文乱码问题
+        for (HttpMessageConverter<?> converter : converters) {
+            if (converter instanceof StringHttpMessageConverter) {
+                ((StringHttpMessageConverter)converter).setDefaultCharset(StandardCharsets.UTF_8);
+            }
+        }
+    }
+
+}

+ 11 - 0
fiveep-controller/src/main/java/com/bizmatics/controller/web/SiteController.java

@@ -4,6 +4,7 @@ package com.bizmatics.controller.web;
 import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.model.Site;
 import com.bizmatics.model.SiteList;
+import com.bizmatics.model.TemplateData;
 import com.bizmatics.service.SiteService;
 import com.bizmatics.service.vo.DeviceCountVO;
 import com.bizmatics.service.vo.SiteVO;
@@ -123,5 +124,15 @@ public class SiteController {
                 demolitionStandardCoal, demolitionStandardCoal1,sitePictureOne,sitePictureTwo,sitePictureThree,templateId);
         return ApiResult.success();
     }
+
+    @GetMapping("GetSite")
+    public ApiResult<List<TemplateData>> GetSite(@RequestParam String id) {
+//        List<TemplateData> TemplateDataList = siteService.GetSite(id);
+        return ApiResult.success(siteService.GetSite(id));
+    }
+    @GetMapping("test1")
+    public String test(){
+        return "这是中文";
+    }
 }
 

+ 2 - 1
fiveep-service/src/main/java/com/bizmatics/service/SiteService.java

@@ -3,6 +3,7 @@ package com.bizmatics.service;
 import com.bizmatics.model.Site;
 import com.bizmatics.common.mvc.base.CrudService;
 import com.bizmatics.model.SiteList;
+import com.bizmatics.model.TemplateData;
 import com.bizmatics.service.vo.DeviceCountVO;
 import com.bizmatics.service.vo.SiteVO;
 import org.apache.ibatis.annotations.Param;
@@ -120,5 +121,5 @@ public interface SiteService extends CrudService<Site> {
      *
      * @param groupingName
      */
-    void SiteUpdate(@Param("groupingName") String groupingName);
+    List<TemplateData> GetSite(@Param("groupingName") String groupingName);
 }

+ 6 - 6
fiveep-service/src/main/java/com/bizmatics/service/impl/SiteServiceImpl.java

@@ -221,9 +221,8 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
             List<TemplateData> TemplateDataList = null;
             TemplateDataList = baseMapper.templateQuery(Integer.parseInt(templateId));
             TemplateData TemplateDataListOne = (TemplateData) TemplateDataList.get(0);
-
             Site site=new Site();
-            site.setSiteName(TemplateDataListOne.getSiteName());
+            site.setSiteName(site_name);
             site.setSiteAddress(TemplateDataListOne.getSiteAddress());
             site.setCompanyCode(11111);
             site.setUserName(TemplateDataListOne.getUserName());
@@ -250,14 +249,15 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
                     Integer.toString(TemplateDataListOne.getDemolitionStandardCoal()),TemplateDataListOne.getDemolitionStandardCoal1()
                     ,TemplateDataListOne.getSitePictureOne(),TemplateDataListOne.getSitePictureTwo(),TemplateDataListOne.getSitePictureThree());
             userSiteService.UserSiteAdd(ID);
-
-
         }
     }
 
 
 
-    public void SiteUpdate(String groupingName){
-
+    public List<TemplateData> GetSite(String id){
+        List<TemplateData> TemplateDataList = null;
+        TemplateDataList = baseMapper.templateQuery(Integer.parseInt(id));
+//        TemplateData TemplateDataListOne = (TemplateData) TemplateDataList.get(0);
+        return TemplateDataList;
     }
 }