111

topsun/src/main/java/com/huigou/topsun/demo/controller/LeaveController.java

@@ -18,7 +18,7 @@ import org.springframework.stereotype.Controller;
  */
 @ControllerMapping("/leave")
 @Controller
-public class LeaveController extends CommonController {
+class LeaveController extends CommonController {
 
     @Autowired
     private LeaveApplication leaveApplication;

topsun/src/main/java/com/huigou/topsun/easySearch/controller/ResourceSearchController.java → topsun/src/main/java/com/huigou/topsun/demo/controller/ResourceSearchController.java

-package com.huigou.topsun.easySearch.controller;
+package com.huigou.topsun.demo.controller;
 
 import com.huigou.topsun.resource.service.ResourceFiledService;
 import com.huigou.topsun.technology.application.ProcessApplication;

topsun/src/main/java/com/huigou/topsun/product/application/ProductApplication.java

@@ -3,6 +3,8 @@ package com.huigou.topsun.product.application;
 import com.huigou.topsun.product.domain.Product;
 import org.springframework.data.domain.Page;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -20,7 +22,7 @@ public interface ProductApplication {
      * @author qinzhenguan
      * @create: 2023/11/29 9:34
      */
-    Page<Product> findProductPage(int page, int size);
+    ArrayList<Map<String, Object>> findProductPage(int page, int size);
 
     /**
      * description  获取产品所有信息

topsun/src/main/java/com/huigou/topsun/product/application/impl/ProductApplicationImpl.java

@@ -46,11 +46,18 @@ public class ProductApplicationImpl implements ProductApplication {
     private final ProductFaceColorRepository faceColorRepository;
 
     @Override
-    public Page<Product> findProductPage(int page, int size) {
-        PageRequest pageRequest = new PageRequest(page, size);
-        Page<Product> productPage = productRepository.findAll(pageRequest);
-        productPage.getContent().stream().map(Product::toString).forEach(System.out::println);
-        return productPage;
+    public ArrayList<Map<String, Object>> findProductPage(int page, int size) {
+//        PageRequest pageRequest = new PageRequest(page, size);
+//        Page<Product> productPage = productRepository.findAll(pageRequest);
+//        mapList.getContent().stream().map(Product::toString).forEach(System.out::println);
+        ArrayList<Product> productPage = (ArrayList<Product>) productRepository.findAll();
+        ObjectMapper mapper = new ObjectMapper();
+        ArrayList<Map<String, Object>> mapList = (ArrayList<Map<String, Object>>) mapper.convertValue(productPage, List.class);
+
+//        convert = mapList.stream().collect(Collectors.toMap(index -> index, Function.identity(),
+//                (oldV, newV) -> oldV));
+
+        return mapList;
     }
 
     /**
@@ -64,7 +71,7 @@ public class ProductApplicationImpl implements ProductApplication {
     public Map<String, Object> queryDetailAll(int productId) {
         Map<String, Object> resultMap = new HashMap<>();
         ProductDetail productDetail = detailRepository.findByProductIdEquals((long)productId);
-        resultMap.put("detai", productDetail);
+        resultMap.put("detail", productDetail);
 //        EntityManager manager = JPAUtils.getEntityManger();
 //        manager.getTransaction().begin();
 //        manager.flush();

topsun/src/main/java/com/huigou/topsun/product/controller/ProductController.java

 package com.huigou.topsun.product.controller;
 
+import com.huigou.topsun.base.coderule.domain.model.CodeRuleKind;
 import com.huigou.topsun.product.domain.Product;
 import com.huigou.topsun.product.application.ProductApplication;
+import com.huigou.topsun.resource.vo.ResourceFiledVo;
 import org.springframework.data.domain.Page;
 import com.huigou.uasp.annotation.ControllerMapping;
 import com.huigou.uasp.client.CommonController;
@@ -9,6 +11,9 @@ import com.huigou.util.SDO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -23,27 +28,51 @@ public class ProductController extends CommonController {
 
     @Autowired
     private ProductApplication productService;
+
+    @Override
+    protected String getPagePath() {
+        return "/biz/topsun/product/";
+    }
+
     /**
      * description 
      * @author qinzhenguan
      * @date 2023/11/27 11:49
      * @return null
      */
-    public String findProduct() {//需要特定返回值
+    public String findProduct() {//需要特定类型返回值
         SDO sdo = this.getSDO();
-        int page = sdo.getInteger("page");
-        int size = sdo.getInteger("size");
-        Page<Product> productPage = productService.findProductPage(page, size);
-        return toResult(productPage);
+//        int page = sdo.getInteger("page");
+//        int size = sdo.getInteger("size");
+        ArrayList<Map<String,Object>> productPage = productService.findProductPage(0, 30);
+        HashMap<Object, Object> map = new HashMap<>();
+        map.put("Rows",productPage);
+        return toResult(map);
     }
 
     public String queryDetailAll() {
         SDO sdo = this.getSDO();
-        int productId = sdo.getInteger("productId");
-        Map<String, Object> map = productService.queryDetailAll(productId);
+        String productId = sdo.getString("id");
+        Map<String, Object> map = productService.queryDetailAll(Integer.parseInt(productId));
 
         return toResult(map);
     }
 
+    public String forwardProduct() {
+        this.putAttribute("ruleKindList", CodeRuleKind.getMap());
+        return forward("product");
+    }
+
+    public String forwardProductDetail() {
+        SDO sdo = this.getSDO();
+        String productId = sdo.getString("productId");
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("productId", productId);
+        Map<String, Object> map2 = productService.queryDetailAll(Integer.parseInt(productId));
+
+        return forward("productDetail", map);
+    }
+
+
 
 }
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/proofing/service/impl/ProofingMakeServiceImpl.java

@@ -34,6 +34,7 @@ public class ProofingMakeServiceImpl implements ProofingMakeService {
 
 
 
+    @Override
     public List<ProofingMakeVo> getProofingMakeVoList(){
         List<ProofingMake> makeAll = proofingMakeRepository.findAll();
         List<ProofingMakeVo> makeVoList = new ArrayList<>();