1.获取用户信息的接口

2.文件上传接口

krock-api/krock-api-all/src/main/java/com/ydw/yunbuyer/api/pm/entity/ProjectItem.java

@@ -24,7 +24,8 @@ public class ProjectItem extends DataModel {
 	private String archive_status;// 归档状态
 	private String bid_file_id;// 招标文件id
 	private String item_status = "未完成 "; // 事件状态 : 未完成 or 已完成
-
+	private String bidding_agreement_path;// 竞买协议文件路径
+	private String bidding_rules_path;// 竞买规则文件路径
 	/**
 	 * t_pm_item 复制过来的字段
 	 */
@@ -386,4 +387,19 @@ public class ProjectItem extends DataModel {
 		this.seller_bid_success_form_id = seller_bid_success_form_id;
 	}
 
+	public String getBidding_agreement_path() {
+		return bidding_agreement_path;
+	}
+
+	public void setBidding_agreement_path(String bidding_agreement_path) {
+		this.bidding_agreement_path = bidding_agreement_path;
+	}
+
+	public String getBidding_rules_path() {
+		return bidding_rules_path;
+	}
+
+	public void setBidding_rules_path(String bidding_rules_path) {
+		this.bidding_rules_path = bidding_rules_path;
+	}
 }

krock-jcebid-cp/krock-web-cp-all/src/main/java/com/ydw/yunbuyer/web/cp/business/rest/ImgController2.java

@@ -120,7 +120,7 @@ public class ImgController2 extends ProjBaseAction {
 			//System.out.println(3);
 			//System.out.println(img);
 			if ("video/mp4".equals(file.getContent_type())) {
-				play(img, req, resp);
+				play(img, req, resp,file.getContent_type());
 			} else {
 				ImgTools.thumbnail_w_h(img, width, height, (OutputStream)os);
 			}
@@ -130,7 +130,44 @@ public class ImgController2 extends ProjBaseAction {
 			os.close();
 		}
 	}
-	public void play(File file, HttpServletRequest request, HttpServletResponse response) {
+
+	@RequestMapping("/file/{file_id}")
+	public void downloadFile(@PathVariable String file_id, String mw, String mh,HttpServletRequest req,HttpServletResponse resp) throws Exception {
+		if (ChkTools.isNull(file_id)) {
+			return;
+		}
+		t_fk_file file = fileService.get(file_id);
+		ServletOutputStream os = resp.getOutputStream();
+		// 获取保存路径
+		String DATA_PATH = "/data/pm";
+		try {
+			File img = null;
+			if (file != null) {
+				img = new File(
+						DATA_PATH + File.separator + file.getFolder() + File.separator + file.getNew_file_name());
+			}
+
+			if (img == null || !img.exists()) {
+				img = new File(req.getSession().getServletContext().getRealPath("") + File.separator + "resource"
+						+ File.separator + "img", "file404.jpg");
+			}
+			int height = ChkTools.getInteger(mh);
+			int width = ChkTools.getInteger(mw);
+			height = height < 0 ? 0 : height;
+			width = width < 0 ? 0 : width;
+			// 设置页面不缓存
+			resp.setHeader("Pragma", "No-cache");
+			resp.setHeader("Cache-Control", "no-cache");
+			resp.setDateHeader("Expires", 0);
+			play(img, req, resp,file.getContent_type());
+		} catch (Exception e) {
+			logger.info("文件找不到:" + e);
+		} finally {
+			os.close();
+		}
+	}
+
+	public void play(File file, HttpServletRequest request, HttpServletResponse response,String content_type) {
 		ServletOutputStream servletOutputStream = null;
 		FileInputStream fileInputStream = null;
 		OutputStream outputStream = null;
@@ -138,7 +175,7 @@ public class ImgController2 extends ProjBaseAction {
 			servletOutputStream = response.getOutputStream();
 			fileInputStream = new FileInputStream(file);
 			byte[] cache = new byte[1024];
-			response.setHeader("Content-Type", "video/mp4");
+			response.setHeader("Content-Type", content_type);
 			response.setHeader("Content-Length", fileInputStream.available() + "");
 			int flag;
 			while ((flag = fileInputStream.read(cache)) != -1)

krock-jcebid-cp/krock-web-cp-all/src/main/java/com/ydw/yunbuyer/web/cp/business/rest/UploadController2.java

@@ -5,6 +5,7 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -210,4 +211,21 @@ public class UploadController2 extends ProjBaseAction {
 		return JsonTools.toJson(end);
 	}
 
+
+	@RequestMapping("/upload/file")
+	@ResponseBody
+	public String upload_file(@RequestParam MultipartFile file,  String suff,String file_name)
+			throws IllegalStateException, IOException {
+		logger.info(file.getName());
+		t_fk_file tf = save_file(file, suff,file_name);
+		Map<String, Object> end = new HashMap<String, Object>();
+		// 发送保存结果
+		String path = "https://www.eqbidding.com/web-cp-all/img_pm/file/";
+		end.put("file_id", tf.getKid());
+		end.put("file_name", tf.getFile_name());
+		end.put("file_url", path+tf.getKid());
+		end.put("content_type", tf.getContent_type());
+		end.put("success", true);
+		return JsonTools.toJson(end);
+	}
 }

krock-jcebid-cp/krock-web-cp-all/src/main/resources/application.yml

@@ -6,7 +6,6 @@ ydw:
   pub : public-service
   back-url: http://127.0.0.1:16027
   pub-url : http://127.0.0.1:16028
-  swagger : true
 server:
   port: 16025
   max-http-header-size: 30920

krock-jcebid-cp/krock-web-cp-all/src/main/resources/static/view_cp_pm/pm/verify/select.js

@@ -2,7 +2,9 @@
 			buttonAlign : "center",
 			bodyStyle : "padding: 60px;",
 			defaultType : "textfield",
-			layout : 
+			width: 850,
+			height: 450,
+			layout :
 				{
 					type : 'table',
 					columns : 2
@@ -90,19 +92,42 @@
 					name : "price_guarantee",
 					labelWidth : 130,
 					editable : false,
-				}
+				},{
+					fieldLabel : "竞买协议",
+					name : "price_guarantee",
+					labelWidth : 130,
+					editable : false,
+					renderer : function(val){
+						return "<div><button onclick=\"getInfo('"+val+"')\">查看</button><button onclick=\"editInfo('price_guarantee')\">编辑</button></div>";
+					}
+				},{
+					fieldLabel : "竞买规则",
+					name : "bidding_rules_path",
+					labelWidth : 130,
+					editable : false,
+					renderer : function(val){
+						return "<div><button onccclick=\"getInfo('"+val+"')\">查看</button><button onclick=\"editInfo('bidding_rules_path')\">编辑</button></div>";
+					}
+				},
 			]
 		});
-		
-		
-		
-		
+
+
+
+
 		var edit_form_panel_win = Ext.create("Ext.Window", {
 			title : "标的物详情 ",
 			closeAction : "hide",
 			items : edit_form_panel
 		});
-		
+
+function getInfo(url){
+		window.location.href = url;
+}
+function editInfo(type){
+	var editKid =edit_form_panel.getForm().findField("kid").getValue();
+	console.log(editKid+"  "+type);
+}
 
 function details(kid){
 	

krock-jcebid/krock-service-pubservices/src/main/resources/application.yml

@@ -1,7 +1,6 @@
 ydw:
   env: dev
   env_old: d
-  swagger: true
 mock:
   mock: true
 gcjs: 

krock-pm/krock-api-pm/src/main/java/com/ydw/yunbuyer/api/pm/entity/ProjectItem.java

@@ -24,7 +24,8 @@ public class ProjectItem extends DataModel {
 	private String archive_status;// 归档状态
 	private String bid_file_id;// 招标文件id
 	private String item_status = "未完成 "; // 事件状态 : 未完成 or 已完成
-
+	private String bidding_agreement_path;// 竞买协议文件路径
+	private String bidding_rules_path;// 竞买规则文件路径
 	/**
 	 * t_pm_item 复制过来的字段
 	 */
@@ -386,4 +387,19 @@ public class ProjectItem extends DataModel {
 		this.seller_bid_success_form_id = seller_bid_success_form_id;
 	}
 
+	public String getBidding_agreement_path() {
+		return bidding_agreement_path;
+	}
+
+	public void setBidding_agreement_path(String bidding_agreement_path) {
+		this.bidding_agreement_path = bidding_agreement_path;
+	}
+
+	public String getBidding_rules_path() {
+		return bidding_rules_path;
+	}
+
+	public void setBidding_rules_path(String bidding_rules_path) {
+		this.bidding_rules_path = bidding_rules_path;
+	}
 }

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/config/Knife4jPmConfiguration.java

@@ -4,6 +4,7 @@ package com.ydw.yunbuyer.web.pm.config;
 import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
 import com.google.common.base.Predicate;
 import io.swagger.annotations.Api;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import springfox.documentation.builders.ApiInfoBuilder;
@@ -17,6 +18,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @Configuration
 @EnableSwagger2
 @EnableKnife4j
+@ConditionalOnProperty(prefix = "ydw", name = "swagger", havingValue = "true")
 public class Knife4jPmConfiguration {
     // 组织Docket对象，翻译过来就是摘要的意思，它是生成API文档的核心对象，里面配置一些必要的信息
     @Bean

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller_wxapp/WxPmController.java

@@ -15,6 +15,7 @@ import com.ydw.yunbuyer.common.utils.live.LiveTools;
 import com.ydw.yunbuyer.web.pm.base.ProjBaseAction;
 import com.ydw.yunbuyer.web.pm.base.Tip;
 import com.ydw.yunbuyer.web.pm.entity.*;
+import com.ydw.yunbuyer.web.pm.entity.user.UserInfoDto;
 import com.ydw.yunbuyer.web.pm.entity.user.t_receive_address;
 import com.ydw.yunbuyer.web.pm.service.*;
 import com.ydw.yunbuyer.web.pm.utils.OrderTools;
@@ -26,6 +27,7 @@ import io.swagger.annotations.ApiOperation;
 import org.apache.http.client.ClientProtocolException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.tmsps.ne4spring.utils.ChkUtil;
@@ -143,7 +145,7 @@ public class WxPmController extends ProjBaseAction {
 	 * @return
 	 */
 	@ApiOperation("查询分类")
-	@RequestMapping(value = "/list_item_classify")
+	@RequestMapping("/list_item_classify")
 	public String list_item_classify() {
 		List<Map<String, Object>> list = pmItemService.list_item_classify();
 		LinkedList<Map<String, Object>> list1 = new LinkedList<Map<String, Object>>();
@@ -182,7 +184,7 @@ public class WxPmController extends ProjBaseAction {
 	 * @return
 	 */
 	@ApiOperation("更新用户信息")
-	@RequestMapping(value = "/update_userinfo")
+	@GetMapping("/update_userinfo")
 	public String update_userinfo(String userinfo) {
 		JSONObject json1 = sessionWxService.getCurrentLoginPersion();
 		JSONObject json = JsonUtil.jsonStrToJsonObject(userinfo);
@@ -207,6 +209,24 @@ public class WxPmController extends ProjBaseAction {
 	}
 
 	/**
+	 * 获取用户信息
+	 *
+	 * @param userinfo
+	 * @return
+	 */
+	@ApiOperation("获取用户信息")
+	@GetMapping(value = "/get_userinfo")
+	public String getUserinfo(){
+		JSONObject json1 = sessionWxService.getCurrentLoginPersion();
+		String kid = json1.getString("kid");
+		Persion persion = persionApi.get(kid);
+		UserInfoDto userInfoDto = new UserInfoDto();
+		BeanUtils.copyProperties(persion,userInfoDto);
+		result.put("UserInfoDto", userInfoDto);
+		return result.toJSONString();
+	}
+
+	/**
 	 * 获取我的中拍信息
 	 * 
 	 * @return

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/entity/t_project_item.java

@@ -24,6 +24,9 @@ public class t_project_item extends DataModel {
 	private String archive_status;// 归档状态
 	private String bid_file_id;// 招标文件id
 	private String item_status = "未完成 "; // 事件状态 : 未完成 or 已完成
+	private String bidding_agreement_path;// 竞买协议文件路径
+	private String bidding_rules_path;// 竞买规则文件路径
+
 
 	/**
 	 * t_pm_item 复制过来的字段
@@ -386,6 +389,22 @@ public class t_project_item extends DataModel {
 		this.seller_bid_success_form_id = seller_bid_success_form_id;
 	}
 
+	public String getBidding_agreement_path() {
+		return bidding_agreement_path;
+	}
+
+	public void setBidding_agreement_path(String bidding_agreement_path) {
+		this.bidding_agreement_path = bidding_agreement_path;
+	}
+
+	public String getBidding_rules_path() {
+		return bidding_rules_path;
+	}
+
+	public void setBidding_rules_path(String bidding_rules_path) {
+		this.bidding_rules_path = bidding_rules_path;
+	}
+
 	public String getAuction_type() {
 		return auction_type;
 	}

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/entity/user/UserInfoDto.java

@@ -0,0 +1,118 @@
+package com.ydw.yunbuyer.web.pm.entity.user;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.ydw.yunbuyer.common.utils.date.CreatedTools;
+import org.tmsps.ne4spring.annotation.FieldType;
+import org.tmsps.ne4spring.annotation.NotMap;
+import org.tmsps.ne4spring.annotation.PK;
+import org.tmsps.ne4spring.annotation.Table;
+import org.tmsps.ne4spring.orm.model.DataModel;
+import org.tmsps.ne4spring.utils.JsonUtil;
+
+import java.math.BigDecimal;
+
+@Table
+public class UserInfoDto extends DataModel {
+
+	// 城市
+	private String city;
+	// 微信昵称
+	private String nickName;
+	// 性别
+	private String gender;
+	// 省份
+	private String province;
+	// 国家
+	private String country;
+	// 头像
+	private String avatarUrl;
+
+
+	@PK
+	@FieldType
+	private String kid;
+	private int status;
+	private long created = System.currentTimeMillis();
+
+	@NotMap
+	private static final long serialVersionUID = 1L;
+
+	// ======= get / set ()=====================
+
+	public String getCity() {
+		return city;
+	}
+
+	public void setCity(String city) {
+		this.city = city;
+	}
+
+	public String getNickName() {
+		return nickName;
+	}
+
+	public void setNickName(String nickName) {
+		this.nickName = nickName;
+	}
+
+	public String getGender() {
+		return gender;
+	}
+
+	public void setGender(String gender) {
+		this.gender = gender;
+	}
+
+	public String getProvince() {
+		return province;
+	}
+
+	public void setProvince(String province) {
+		this.province = province;
+	}
+
+	public String getCountry() {
+		return country;
+	}
+
+	public void setCountry(String country) {
+		this.country = country;
+	}
+
+	public String getAvatarUrl() {
+		return avatarUrl;
+	}
+
+	public void setAvatarUrl(String avatarUrl) {
+		this.avatarUrl = avatarUrl;
+	}
+
+	public String getKid() {
+		return kid;
+	}
+
+	public void setKid(String kid) {
+		this.kid = kid;
+	}
+
+	public int getStatus() {
+		return status;
+	}
+
+	@Override
+	public void setStatus(int status) {
+		this.status = status;
+	}
+
+	public long getCreated() {
+		return created;
+	}
+
+	public void setCreated(long created) {
+		this.created = created;
+	}
+
+	public static long getSerialVersionUID() {
+		return serialVersionUID;
+	}
+}

krock-pm/krock-web-pm/src/main/resources/application-test.yml

@@ -3,6 +3,7 @@ ydw:
   domain: yun
 #  res: H:\data\static
   res: /data/webapp_krock/web-pm/static
+  swagger: true
 server:
   port: 16032
   servlet:

krock-pm/krock-web-pm/src/main/resources/sql/数据库修改语句.sql

@@ -1,2 +1,8 @@
 ALTER TABLE `krock-service-pm`.`t_pm_offline_apply`
-ADD COLUMN `file_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' AFTER `company_name`;
+ADD COLUMN `file_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' AFTER `company_name`;
+
+-- 添加竞买
+ALTER TABLE `krock-service-pm`.`t_project_item`
+ADD COLUMN `bidding_agreement_path` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '竞买协议文件路径' AFTER `auction_type`;
+ALTER TABLE `krock-service-pm`.`t_project_item`
+ADD COLUMN `bidding_rules_path` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '竞买规则文件路径' AFTER `auction_type`;