Commit 7b4f8f79 authored by 赵啸非's avatar 赵啸非

部署资源添加分辨率字典

parent 6c3f3781
......@@ -15,10 +15,18 @@ module.exports = {
secure: false
},
"/file": {
target: "http://192.168.0.98:11078",
target: "http://192.168.0.98:11091",
//target: 'http://127.0.0.1:18222',
changeOrigin: true,
},
"/moudle": {
target: "http://192.168.0.98:11091",
changeOrigin: true,
logLevel: 'debug',
pathRewrite:{
'^':''
}
}
},
},
};
......@@ -11,7 +11,6 @@ import com.mortals.framework.model.OrderCol;
import com.mortals.framework.util.DataUtil;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.common.code.ImageReEnum;
import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.feign.skin.ISkinBaseFeign;
import com.mortals.xhx.module.device.model.DeviceModuleDistributeEntity;
......@@ -146,7 +145,7 @@ public class DeviceModuleDistributeController extends BaseCRUDJsonBodyMappingCon
ProductEntity productEntity = productService.get(entity.getProductId(), context);
entity.setProductCode(productEntity.getProductCode());
entity.setProductName(productEntity.getProductName());
entity.setImageResolutionValue(ImageReEnum.getByValue(Integer.parseInt(entity.getImageResolution())).getDesc());
// entity.setImageResolutionValue(ImageReEnum.getByValue(Integer.parseInt(entity.getImageResolution())).getDesc());
//查询新增的是否存在,如果存在 则更新,标准为分辨率+产品
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment